server config builds now

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

hosts/desktop/config.nix

@@ -1,6 +1,4 @@
 {pkgs, ...}: {
-  system.stateVersion = "24.05";
-  nixpkgs.config.allowUnfree = true;
   imports = [
     ./hardware.nix
     ./home.nix

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
         ];
 

hosts/laptop/config.nix

@@ -1,6 +1,4 @@
 {pkgs, config, ...}: {
-  system.stateVersion = "24.05";
-  nixpkgs.config.allowUnfree = true;
   imports = [
     ./hardware.nix
     ./home.nix

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
         ];
 

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;

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";
   };

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";
   };

modules/home/environment/waybar.nix

@@ -1,4 +1,4 @@
-{pkgs, scheme, host, lib, config, ...}:
+{pkgs, scheme ? {}, host, lib, config, ...}:
 
 let
   desktop = host == "oganesson";

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";
   };

modules/server/default.nix

@@ -1,7 +1,7 @@
 {
   config,
   inputs,
-  scheme,
+  scheme ? {},
   wallpaper,
   username,
   host,

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;

modules/sys/environment/stylix.nix

@@ -1,6 +1,6 @@
 {
   pkgs,
-  scheme,
+  scheme ? {},
   wallpaper,
   lib,
   config,

modules/sys/software/nixvim/options.nix

@@ -1,5 +1,5 @@
 {
-  scheme,
+  scheme ? {},
   config,
   ...
 }: {