improved organization

modules/server/home/default.nix

@@ -1,4 +1,8 @@
 { ... }: {
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    users.twoneis = {
       imports = [
         ../../system/home/direnv
         ../../system/home/editor
@@ -15,4 +19,6 @@
       };
 
       programs.home-manager.enable = true;
+    };
+  };
 }

modules/system/default.nix

@@ -14,6 +14,11 @@
     ./virt.nix
   ];
 
+  # Overlays for nixpkgs
+  nixpkgs.overlays = [
+    inputs.nur.overlay
+  ];
+
   # Needed for some nautilus features like auto-mount and trash
   services.gvfs.enable = true;
 

modules/system/home/default.nix

@@ -1,4 +1,8 @@
 { ... }: {
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    users.twoneis = {
       imports = [
         ./art
         ./browser
@@ -36,4 +40,6 @@
           };
         };
       };
+    };
+  };
 }

modules/system/persist/default.nix

@@ -3,5 +3,6 @@
   users.users.twoneis.initialHashedPassword = "$y$j9T$0pmWE8A2JWcr2BDqqZ2u./$Km7K1hml9Gy0fc9DzBsDTvpyCKZ9DW0GOkD.lDcyYw0";
   users.users.root.initialHashedPassword = "$y$j9T$U8fvYSDoZxqVrkjlZM2Db.$qvkT9GIbVJ23EtB7KcqyI8u7RKJ99pYSXNu8IhVcDx9";
   environment.persistence."/persist" = {
+    
   };
 }

outputs.nix

@@ -10,18 +10,12 @@
       modules = [
         ./devices/ellaca
         ./modules/system
+        ./modules/system/home
         ./modules/system/persist
         ./options.nix
         niri.nixosModules.niri
         impermanence.nixosModules.impermanence
-        home-manager.nixosModules.home-manager {
-          nixpkgs.overlays = [ nur.overlay ];
-          home-manager = {
-            useGlobalPkgs = true;
-            useUserPackages = true;
-            users.twoneis = import ./modules/system/home;
-          };
-        }
+        home-manager.nixosModules.home-manager
       ];
     };
 
@@ -34,17 +28,11 @@
       modules = [
         ./devices/akarso
         ./modules/system
+        ./modules/system/home
         ./options.nix
         nixos-hardware.nixosModules.microsoft-surface-pro-intel
         niri.nixosModules.niri
-        home-manager.nixosModules.home-manager {
-          nixpkgs.overlays = [ nur.overlay ];
-          home-manager = {
-            useGlobalPkgs = true;
-            useUserPackages = true;
-            users.twoneis = import ./modules/system/home;
-          };
-        }
+        home-manager.nixosModules.home-manager
       ];
     };
 
@@ -58,14 +46,7 @@
       modules = [
         ./devices/creosote
         ./modules/server
-        ./options.nix
-        home-manager.nixosModules.home-manager {
-          home-manager = {
-            useGlobalPkgs = true;
-            useUserPackages = true;
-            users.twoneis = import ./modules/server/home;
-          };
-        }
+        home-manager.nixosModules.home-manager
       ];
     };
   };