fix: Remove the need for stylix on headless

common/gui/common.nix

@@ -1,4 +1,8 @@
 {pkgs, ...}: {
+  imports = [
+    ../../common/style/stylix.nix
+  ];
+
   services.printing.enable = true;
 
   hardware.keyboard.qmk.enable = true;

common/nixos/common.nix

@@ -12,7 +12,6 @@
     ./locale.nix
     ./smart.nix
     # ./prometheus.nix
-    ../../common/style/stylix.nix
   ];
   #
   nixpkgs.config.allowUnfree = true;

flake.nix

@@ -34,6 +34,23 @@
         specialArgs = {inherit inputs outputs;};
       };
 
+    mkHeadlessNixos = modules:
+      nixpkgs.lib.nixosSystem {
+        modules =
+          modules
+          ++ [
+            home-manager.nixosModules.home-manager
+            nix-index-database.nixosModules.nix-index
+            {
+              home-manager.users.kdb424 = ./home-manager/machines/headless.nix;
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.extraSpecialArgs = {inherit inputs outputs;};
+            }
+          ];
+        specialArgs = {inherit inputs outputs;};
+      };
+
     mkDarwin = system: modules:
       inputs.darwin.lib.darwinSystem {
         inherit modules system inputs;
@@ -93,9 +110,8 @@
       ];
 
       # Small intel server
-      kif = mkNixos [
+      kif = mkHeadlessNixos [
         ./hosts/kif
-        {home-manager.users.kdb424 = ./home-manager/machines/headless.nix;}
       ];
 
       # Ryzen Fifth gen
@@ -105,9 +121,8 @@
       ];
 
       # Ryzen Second gen
-      morbo = mkNixos [
+      morbo = mkHeadlessNixos [
         ./hosts/morbo
-        {home-manager.users.kdb424 = ./home-manager/machines/headless.nix;}
       ];
     };
 
@@ -122,12 +137,7 @@
     homeConfigurations = {
       "kdb424@cubert" = mkHome [./home-manager/machines/cubert.nix] nixpkgs.legacyPackages.aarch64-darwin;
       "kdb424@farnsworth" = mkHome [./home-manager/machines/headless.nix] nixpkgs.legacyPackages.aarch64-linux;
-      "kdb424@zapp" =
-        mkHome [
-          stylix.homeManagerModules.stylix
-          ./home-manager/machines/headless.nix
-        ]
-        nixpkgs.legacyPackages.x86_64-linux;
+      "kdb424@zapp" = mkHome [./home-manager/machines/headless.nix] nixpkgs.legacyPackages.x86_64-linux;
     };
   };
 

home-manager/machines/headless.nix

@@ -23,10 +23,4 @@
   imports = [
     ../modules/common.nix
   ];
-  stylix = {
-    image = pkgs.fetchurl {
-      url = "https://w.wallhaven.cc/full/1p/wallhaven-1poo61.jpg";
-      sha256 = "sha256-PFlo9gszKxsM73jdIP+IB6Hv+AoQlryVXxd++1oZN+c=";
-    };
-  };
 }

home-manager/modules/common.nix

@@ -7,7 +7,7 @@
   imports = [
     ./git.nix
     ./tmux.nix
-    ./lunarvim.nix
+    # ./lunarvim.nix
     ./vim.nix
     ./zsh
   ];