diff --git a/flake.nix b/flake.nix index c3ecada..39f96fb 100644 --- a/flake.nix +++ b/flake.nix @@ -11,10 +11,14 @@ stylix = { url = "github:danth/stylix"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; - inputs.nur.inputs.nixpkgs.follows = "nixpkgs"; - inputs.nur.inputs.flake-parts.follows = "stylix/flake-parts"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; + nur.inputs = { + nixpkgs.follows = "nixpkgs"; + flake-parts.follows = "stylix/flake-parts"; + }; + }; }; auto-cpufreq = { @@ -38,7 +42,6 @@ outputs = { nixpkgs, - home-manager, nix-flatpak, auto-cpufreq, ... diff --git a/hosts/Garand-Desktop/variables.nix b/hosts/Garand-Desktop/variables.nix index 4f03323..8891f16 100644 --- a/hosts/Garand-Desktop/variables.nix +++ b/hosts/Garand-Desktop/variables.nix @@ -58,6 +58,7 @@ #stylixImage = ../../wallpapers/edward-elric-fullmetal-alchemist.jpg; #stylixImage = ../../wallpapers/fire-nation.jpg; #stylixImage = ../../wallpapers/four-elements.jpg; + # stylixImage = ../../wallpapers/fullmetal-alchemist-5120x2880-10399.png; #stylixImage = ../../wallpapers/Grounded_Wallpaper_4K.jpg; #stylixImage = ../../wallpapers/jablon.jpg; #stylixImage = ../../wallpapers/rammstein-log-two.jpg; diff --git a/hosts/Garand-Laptop/variables.nix b/hosts/Garand-Laptop/variables.nix index e1cffb0..cc88fd3 100644 --- a/hosts/Garand-Laptop/variables.nix +++ b/hosts/Garand-Laptop/variables.nix @@ -57,11 +57,12 @@ # This will set your color palette # Default background # Add new images to ~/garandos/wallpapers - stylixImage = ../../wallpapers/attack-on-titan-mikasa-ackerman.jpg; + # stylixImage = ../../wallpapers/attack-on-titan-mikasa-ackerman.jpg; #stylixImage = ../../wallpapers/DW_Pacts.jpg; #stylixImage = ../../wallpapers/edward-elric-fullmetal-alchemist.jpg; #stylixImage = ../../wallpapers/fire-nation.jpg; #stylixImage = ../../wallpapers/four-elements.jpg; + stylixImage = ../../wallpapers/fullmetal-alchemist-5120x2880-10399.png; #stylixImage = ../../wallpapers/Grounded_Wallpaper_4K.jpg; #stylixImage = ../../wallpapers/jablon.jpg; #stylixImage = ../../wallpapers/rammstein-log-two.jpg; diff --git a/hosts/default/variables.nix b/hosts/default/variables.nix index f4405bf..e3c4219 100644 --- a/hosts/default/variables.nix +++ b/hosts/default/variables.nix @@ -64,6 +64,7 @@ #stylixImage = ../../wallpapers/edward-elric-fullmetal-alchemist.jpg; #stylixImage = ../../wallpapers/fire-nation.jpg; #stylixImage = ../../wallpapers/four-elements.jpg; + # stylixImage = ../../wallpapers/fullmetal-alchemist-5120x2880-10399.png; #stylixImage = ../../wallpapers/Grounded_Wallpaper_4K.jpg; #stylixImage = ../../wallpapers/jablon.jpg; #stylixImage = ../../wallpapers/rammstein-log-two.jpg; diff --git a/modules/home/bash-aliases.nix b/modules/home/bash-aliases.nix index 51bd636..0c5de0a 100644 --- a/modules/home/bash-aliases.nix +++ b/modules/home/bash-aliases.nix @@ -6,10 +6,11 @@ pullos = "git -C /home/${username}/garandos pull"; upd = "nh os switch --hostname ${host}"; upg = "nh os switch --hostname ${host} --update"; + upf = "sudo nix flake update"; upd-bt = "nh os boot --hostname ${host}"; upd-ts = "nh os test --hostname ${host}"; upd-bd = "nh os build --hostname ${host}"; - ncg = "nix-collect-garbage --delete-old && sudo nix-collect-garbage -d && sudo /run/current-system/bin/switch-to-configuration boot"; + ncg = "nh clean all"; # Development aliases srvenv = "source .venv/bin/activate"; diff --git a/modules/home/git.nix b/modules/home/git.nix index 321b250..f5feff0 100644 --- a/modules/home/git.nix +++ b/modules/home/git.nix @@ -8,7 +8,7 @@ in userName = "${gitUsername}"; userEmail = "${gitEmail}"; - extraConfig = { + settings = { # FOSS-friendly settings push.default = "simple"; # Match modern push behavior credential.helper = "cache --timeout=7200"; diff --git a/modules/home/stylix.nix b/modules/home/stylix.nix index f8ee705..16f9419 100644 --- a/modules/home/stylix.nix +++ b/modules/home/stylix.nix @@ -8,6 +8,7 @@ hyprlock.enable = false; vscode.enable = false; zed.enable = false; + vesktop.enable = false; qt = { enable = true; platform = "qtct"; diff --git a/wallpapers/fullmetal-alchemist-5120x2880-10399.png b/wallpapers/fullmetal-alchemist-5120x2880-10399.png new file mode 100644 index 0000000..6bcad10 Binary files /dev/null and b/wallpapers/fullmetal-alchemist-5120x2880-10399.png differ