builds on laptop

flake.nix

@@ -69,6 +69,7 @@
             '';
 
         };   
+        
         sugar-dark-sddm-theme = { pkgs }: pkgs.stdenv.mkDerivation {
 
             name = "sugar-dark";
@@ -97,16 +98,28 @@
         };
 
         nixosConfigurations.laptop = nixpkgs.lib.nixosSystem {
-      specialArgs = { inherit inputs; };
+            specialArgs = { 
+                inputs = inputs // { 
+                    nathan-home-manager = import ./home-manager/default.nix;
+                    tokyo-night-sddm-theme = self.tokyo-night-sddm-theme;
+                }; 
+            };
             modules = [
                 ./system-config/configuration/laptop
+                ./system-config
             ];
         };
 
         nixosConfigurations.live = nixpkgs.lib.nixosSystem {
-      specialArgs = { inherit inputs; };
+            specialArgs = { 
+                inputs = inputs // { 
+                    nathan-home-manager = import ./home-manager/default.nix;
+                    tokyo-night-sddm-theme = self.tokyo-night-sddm-theme;
+                }; 
+            };
             modules = [
                 ./system-config/configuration/live
+                ./system-config
             ];
         };
     };

system-config/configuration/laptop/default.nix

@@ -5,8 +5,6 @@
     imports = [
         ./hardware-configuration.nix
 
-        inputs.system.nixosModule
-
         inputs.home-manager.nixosModules.default
 
         inputs.sops-nix.nixosModules.sops
@@ -89,7 +87,7 @@
                         firefox.enable = true;
                     };
                 }
-                inputs.nathan.homeManagerModule
+                inputs.nathan-home-manager
             ];
         };
     };

system-config/configuration/live/default.nix

@@ -12,7 +12,6 @@
 
         #home-manager.nixosModules.default
 
-        #system.nixosModule
     ];
 
     config = {
@@ -49,7 +48,7 @@
             extraSpecialArgs = { inherit inputs; };
             users = {
                 "nathan" = lib.mkMerge [
-                    inputs.nathan.homeManagerModule
+                    inputs.nathan-home-manager
                     {
                         config.homeconfig = {
                             impermanence.enable = false;