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:
@@ -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 = {
|
||||
|
||||
Reference in New Issue
Block a user