GarandPLG/nix-zaneyos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Aktualizacja konfiguracji Nix i Home Managera

Browse Source 
- Zaktualizowano `flake.lock`, aktualizując zależności `home-manager`, `nixpkgs` i `stylix`
- Dodano pakiet `gambit-chess` do listy instalowanych programów
- Usunięto wyłączenie Firefoksa z konfiguracji
- Uporządkowano i poprawiono strukturę pliku `home.nix`, przenosząc ustawienia Home Managera do sekcji `home`
- Przeniesiono konfigurację skryptów oraz Home Managera w `home.nix` w bardziej logiczne sekcje
- Dodano `extraConfig` do konfiguracji Git, ustawiając pamięć podręczną poświadczeń na 3600 sekund
This commit is contained in:
installer
2025-02-14 09:32:54 +01:00
parent 793174f97d
commit 2a3a42a087
4 changed files with 63 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
flake.lock generated
View File

@@ -228,11 +228,11 @@
]
},
"locked": {
"lastModified": 1739298825,
"narHash": "sha256-q9CzTY7n8n9RK9mKUQ4VbaKdydhXQqzphahEG5Wt8sI=",
"lastModified": 1739470101,
"narHash": "sha256-NxNe32VB4XI/xIXrsKmIfrcgtEx5r/5s52pL3CpEcA4=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "f0a31d38e6de48970ce1fe93e6ea343e20a9c80a",
"rev": "5031c6d2978109336637977c165f82aa49fa16a7",
"type": "github"
},
"original": {
@@ -244,11 +244,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1739020877,
"narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=",
"lastModified": 1739214665,
"narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "a79cfe0ebd24952b580b1cf08cd906354996d547",
"rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a",
"type": "github"
},
"original": {
@@ -291,11 +291,11 @@
"tinted-zed": "tinted-zed"
},
"locked": {
"lastModified": 1739309576,
"narHash": "sha256-IMK19j1b2VH44lUad2/3BSski9T4ecrCHFlkjKWQV2o=",
"lastModified": 1739375014,
"narHash": "sha256-0fNbvZ1Dod4rDIfwGnC7CzJ3wRFSF1v5AvNCmNkVgXo=",
"owner": "danth",
"repo": "stylix",
"rev": "d8289c3f0e5995863921ea207392c122f5d59f6d",
"rev": "e86de61bb8f5f2b6459d0be3e3291ad16db4b777",
"type": "github"
},
"original": {

1
hosts/garand-laptop/config/nixpkgs.nix
View File

@@ -139,6 +139,7 @@
lazydocker
lazygit
lutris
gambit-chess
(vscode-with-extensions.override {
vscode = vscodium;
vscodeExtensions = with vscode-extensions;

1
hosts/garand-laptop/config/programs.nix
View File

@@ -1,6 +1,5 @@
{pkgs, ...}: {
programs = {
firefox.enable = false;
starship = {
enable = true;
settings = {

105
hosts/garand-laptop/home.nix
View File

@@ -7,11 +7,6 @@
}: let
inherit (import ./variables.nix) gitUsername gitEmail;
in {
# Home Manager Settings
home.username = "${username}";
home.homeDirectory = "/home/${username}";
home.stateVersion = "23.11";
# Import Program Configurations
imports = [
../../config/emoji.nix
@@ -26,33 +21,50 @@ in {
../../config/fastfetch
];
# Place Files Inside Home Directory
home.file = {
"Pictures/Wallpapers".source = ../../config/wallpapers;
"Pictures/Wallpapers".recursive = true;
".config/wlogout/icons".source = ../../config/wlogout;
".config/wlogout/icons".recursive = true;
".face.icon".source = ../../config/face.jpg;
".config/face.jpg".source = ../../config/face.jpg;
".config/swappy/config".text = ''
[Default]
save_dir=/home/${username}/Pictures/Screenshots
save_filename_format=swappy-%Y%m%d-%H%M%S.png
show_panel=false
line_size=5
text_size=20
text_font=Ubuntu
paint_mode=brush
early_exit=true
fill_shape=false
'';
};
# Install & Configure Git
programs.git = {
enable = true;
userName = "${gitUsername}";
userEmail = "${gitEmail}";
# Home Manager Settings
home = {
username = "${username}";
homeDirectory = "/home/${username}";
stateVersion = "23.11";
# Place Files Inside Home Directory
file = {
"Pictures/Wallpapers".source = ../../config/wallpapers;
"Pictures/Wallpapers".recursive = true;
".config/wlogout/icons".source = ../../config/wlogout;
".config/wlogout/icons".recursive = true;
".face.icon".source = ../../config/face.jpg;
".config/face.jpg".source = ../../config/face.jpg;
".config/swappy/config".text = ''
[Default]
save_dir=/home/${username}/Pictures/Screenshots
save_filename_format=swappy-%Y%m%d-%H%M%S.png
show_panel=false
line_size=5
text_size=20
text_font=Ubuntu
paint_mode=brush
early_exit=true
fill_shape=false
'';
};
# Scripts
packages = [
(import ../../scripts/emopicker9000.nix {inherit pkgs;})
(import ../../scripts/task-waybar.nix {inherit pkgs;})
(import ../../scripts/squirtle.nix {inherit pkgs;})
(import ../../scripts/nvidia-offload.nix {inherit pkgs;})
(import ../../scripts/wallsetter.nix {
inherit pkgs;
inherit username;
})
(import ../../scripts/web-search.nix {inherit pkgs;})
(import ../../scripts/rofi-launcher.nix {inherit pkgs;})
(import ../../scripts/screenshootin.nix {inherit pkgs;})
(import ../../scripts/list-hypr-bindings.nix {
inherit pkgs;
inherit host;
})
];
};
# Create XDG Dirs
@@ -102,25 +114,6 @@ in {
platformTheme.name = lib.mkDefault "gtk3";
};
# Scripts
home.packages = [
(import ../../scripts/emopicker9000.nix {inherit pkgs;})
(import ../../scripts/task-waybar.nix {inherit pkgs;})
(import ../../scripts/squirtle.nix {inherit pkgs;})
(import ../../scripts/nvidia-offload.nix {inherit pkgs;})
(import ../../scripts/wallsetter.nix {
inherit pkgs;
inherit username;
})
(import ../../scripts/web-search.nix {inherit pkgs;})
(import ../../scripts/rofi-launcher.nix {inherit pkgs;})
(import ../../scripts/screenshootin.nix {inherit pkgs;})
(import ../../scripts/list-hypr-bindings.nix {
inherit pkgs;
inherit host;
})
];
services = {
hypridle = {
settings = {
@@ -145,6 +138,15 @@ in {
};
programs = {
home-manager.enable = true;
git = {
enable = true;
userName = "${gitUsername}";
userEmail = "${gitEmail}";
extraConfig = {
credential.helper = "cache --timeout=3600";
};
};
gh.enable = true;
btop = {
enable = true;
@@ -215,7 +217,6 @@ in {
kys = "shutdown now";
};
};
home-manager.enable = true;
hyprlock = {
enable = true;
settings = {