From c216b0285858a64efdbf6085e86969c95b6c155d Mon Sep 17 00:00:00 2001 From: pagedmov Date: Sat, 2 Nov 2024 11:54:44 -0400 Subject: [PATCH] server config builds now --- flake.nix | 2 +- hosts/desktop/config.nix | 2 -- hosts/desktop/home.nix | 3 +-- hosts/laptop/config.nix | 2 -- hosts/laptop/home.nix | 3 +-- hosts/server/home.nix | 3 ++- modules/home/environment/spicetify.nix | 3 ++- modules/home/environment/stylix.nix | 2 +- modules/home/environment/waybar.nix | 2 +- modules/home/programs/kitty.nix | 2 +- modules/server/default.nix | 2 +- modules/sys/environment/nix.nix | 2 ++ modules/sys/environment/stylix.nix | 2 +- modules/sys/software/nixvim/options.nix | 2 +- 14 files changed, 15 insertions(+), 17 deletions(-) diff --git a/flake.nix b/flake.nix index f6a8609..0360202 100644 --- a/flake.nix +++ b/flake.nix @@ -102,7 +102,7 @@ xenon = nixpkgs.lib.nixosSystem { specialArgs = { host = "xenon"; - inherit self inputs username; + inherit self inputs scheme username; }; modules = [ ./hosts/server/config.nix diff --git a/hosts/desktop/config.nix b/hosts/desktop/config.nix index dda1bf7..874e5ec 100644 --- a/hosts/desktop/config.nix +++ b/hosts/desktop/config.nix @@ -1,6 +1,4 @@ {pkgs, ...}: { - system.stateVersion = "24.05"; - nixpkgs.config.allowUnfree = true; imports = [ ./hardware.nix ./home.nix diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix index 1786879..96fc04e 100644 --- a/hosts/desktop/home.nix +++ b/hosts/desktop/home.nix @@ -6,7 +6,7 @@ username, wallpaper, lib, - scheme, + scheme ? {}, config, ... }: let @@ -22,7 +22,6 @@ in { ${username} = { programs.home-manager.enable = true; imports = [ - inputs.spicetify-nix.homeManagerModules.default inputs.self.outputs.homeManagerModules.default ]; diff --git a/hosts/laptop/config.nix b/hosts/laptop/config.nix index bd52d19..528bdba 100644 --- a/hosts/laptop/config.nix +++ b/hosts/laptop/config.nix @@ -1,6 +1,4 @@ {pkgs, config, ...}: { - system.stateVersion = "24.05"; - nixpkgs.config.allowUnfree = true; imports = [ ./hardware.nix ./home.nix diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix index 1786879..96fc04e 100644 --- a/hosts/laptop/home.nix +++ b/hosts/laptop/home.nix @@ -6,7 +6,7 @@ username, wallpaper, lib, - scheme, + scheme ? {}, config, ... }: let @@ -22,7 +22,6 @@ in { ${username} = { programs.home-manager.enable = true; imports = [ - inputs.spicetify-nix.homeManagerModules.default inputs.self.outputs.homeManagerModules.default ]; diff --git a/hosts/server/home.nix b/hosts/server/home.nix index cefe30c..714da4d 100644 --- a/hosts/server/home.nix +++ b/hosts/server/home.nix @@ -4,6 +4,7 @@ self, inputs, lib, + scheme, username, config, ... @@ -16,7 +17,7 @@ in { useUserPackages = true; useGlobalPkgs = true; backupFileExtension = "backup"; - extraSpecialArgs = { inherit self inputs host username nur; }; + extraSpecialArgs = { inherit self inputs scheme host username nur; }; users = { ${username} = { programs.home-manager.enable = true; diff --git a/modules/home/environment/spicetify.nix b/modules/home/environment/spicetify.nix index 9475520..1ff34d8 100644 --- a/modules/home/environment/spicetify.nix +++ b/modules/home/environment/spicetify.nix @@ -1,6 +1,7 @@ -{lib, config, pkgs, inputs, scheme, ... }: let +{lib, config, pkgs, inputs, scheme ? {}, ... }: let spicePkgs = inputs.spicetify-nix.legacyPackages.${pkgs.system}; in { + imports = [inputs.spicetify-nix.homeManagerModules.default]; options = { spicetifyConfig.enable = lib.mkEnableOption "enable my spicetify options"; }; diff --git a/modules/home/environment/stylix.nix b/modules/home/environment/stylix.nix index 2557b3a..cc6b70b 100644 --- a/modules/home/environment/stylix.nix +++ b/modules/home/environment/stylix.nix @@ -1,4 +1,4 @@ -{lib, config, pkgs, scheme, wallpaper, ... }: { +{lib, config, pkgs, scheme ? {}, wallpaper, ... }: { options = { stylixHomeConfig.enable = lib.mkEnableOption "enables my stylix Home-Manager options"; }; diff --git a/modules/home/environment/waybar.nix b/modules/home/environment/waybar.nix index 4f6e911..3759326 100644 --- a/modules/home/environment/waybar.nix +++ b/modules/home/environment/waybar.nix @@ -1,4 +1,4 @@ -{pkgs, scheme, host, lib, config, ...}: +{pkgs, scheme ? {}, host, lib, config, ...}: let desktop = host == "oganesson"; diff --git a/modules/home/programs/kitty.nix b/modules/home/programs/kitty.nix index e162341..efab290 100644 --- a/modules/home/programs/kitty.nix +++ b/modules/home/programs/kitty.nix @@ -1,4 +1,4 @@ -{lib, config, pkgs, scheme, ... }: { +{lib, config, pkgs, scheme ? {}, ... }: { options = { kittyConfig.enable = lib.mkEnableOption "enables my kitty configuration"; }; diff --git a/modules/server/default.nix b/modules/server/default.nix index b5ca891..895931c 100644 --- a/modules/server/default.nix +++ b/modules/server/default.nix @@ -1,7 +1,7 @@ { config, inputs, - scheme, + scheme ? {}, wallpaper, username, host, diff --git a/modules/sys/environment/nix.nix b/modules/sys/environment/nix.nix index c62537b..8354ff3 100644 --- a/modules/sys/environment/nix.nix +++ b/modules/sys/environment/nix.nix @@ -3,6 +3,8 @@ nixSettings.enable = lib.mkEnableOption "enables my nixos settings"; }; config = lib.mkIf config.nixSettings.enable { + system.stateVersion = "24.05"; + nixpkgs.config.allowUnfree = true; nix = { settings = { auto-optimise-store = true; diff --git a/modules/sys/environment/stylix.nix b/modules/sys/environment/stylix.nix index c84620e..04e114b 100644 --- a/modules/sys/environment/stylix.nix +++ b/modules/sys/environment/stylix.nix @@ -1,6 +1,6 @@ { pkgs, - scheme, + scheme ? {}, wallpaper, lib, config, diff --git a/modules/sys/software/nixvim/options.nix b/modules/sys/software/nixvim/options.nix index 5eda762..652a31b 100644 --- a/modules/sys/software/nixvim/options.nix +++ b/modules/sys/software/nixvim/options.nix @@ -1,5 +1,5 @@ { - scheme, + scheme ? {}, config, ... }: {