Aktualizacja konfiguracji Nix i Home Managera

- 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

18
flake.lock generated
View File

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

View File

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

View File

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

View File

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