Refactor modules into nixos and home-manager

hosts/atlas/default.nix

@@ -22,29 +22,22 @@
   users.extraGroups.vboxusers.members = [ "jordan" ];
 
   modules = {
-    desktop = {
-      apps = {
-        qbittorrent.enable = true;
-        thunderbird.enable = true;
+    programs = {
+      dev = {
+        node.enable = true;
       };
-      browsers = {
-        firefox.enable = true;
-      };
-      media.graphics = {
+      firefox.enable = true;
+      git.enable = true;
+      gpg.enable = true;
+      graphics = {
         raster.enable = true;
         vector.enable = true;
       };
-      office.libreoffice.enable = true;
-    };
-    dev = {
-      node.enable = true;
-    };
-    editors = {
+      libreoffice.enable = true;
       neovim.enable = true;
-    };
-    security = {
-      gpg.enable = true;
       pass.enable = true;
+      qbittorrent.enable = true;
+      thunderbird.enable = true;
     };
     services = {
       borgmatic = {
@@ -56,7 +49,6 @@
       };
     };
     shell = {
-      git.enable = true;
       zsh.enable = true;
     };
   };

hosts/common.nix

@@ -4,7 +4,8 @@
   imports = [
     self.inputs.agenix.nixosModules.age
     self.inputs.home-manager.nixosModule
-    ../modules
+    ../modules/home-manager
+    ../modules/nixos
   ];
 
   nixpkgs.overlays = [

hosts/desktop.nix

@@ -52,8 +52,8 @@
   ];
 
   modules = {
-    desktop.gnome.enable = true;
-    networking.tailscale.enable = true;
+    system.desktop.gnome.enable = true;
+    services.tailscale.enable = true;
   };
 
   environment.systemPackages = with pkgs; [

hosts/eos/default.nix

@@ -25,24 +25,18 @@
   };
 
   modules = {
-    desktop = {
-      apps.qbittorrent.enable = true;
-      browsers = {
-        firefox.enable = true;
+    programs = {
+      dev = {
+        node.enable = true;
       };
-    };
-    dev = {
-      node.enable = true;
-    };
-    editors = {
-      neovim.enable = true;
-    };
-    security = {
+      firefox.enable = true;
+      git.enable = true;
       gpg.enable = true;
+      neovim.enable = true;
       pass.enable = true;
+      qbittorrent.enable = true;
     };
     shell = {
-      git.enable = true;
       zsh.enable = true;
     };
   };

hosts/helios/default.nix

@@ -22,21 +22,16 @@
   };
 
   modules = {
-    desktop = {
-      apps.qbittorrent.enable = true;
-      browsers = {
-        firefox.enable = true;
+    programs = {
+      dev = {
+        node.enable = true;
       };
-    };
-    dev = {
-      node.enable = true;
-    };
-    editors = {
-      neovim.enable = true;
-    };
-    security = {
+      firefox.enable = true;
+      git.enable = true;
       gpg.enable = true;
+      neovim.enable = true;
       pass.enable = true;
+      qbittorrent.enable = true;
     };
     services = {
       borgmatic = {
@@ -48,7 +43,6 @@
       };
     };
     shell = {
-      git.enable = true;
       zsh.enable = true;
     };
   };

hosts/hypnos/default.nix

@@ -30,7 +30,7 @@
       videoDrivers = [ "nvidia" ];
     };
     displayManager = {
-      defaultSession = if config.modules.desktop.kde.enable then "plasmax11" else "gnome-xorg";
+      defaultSession = if config.modules.system.desktop.kde.enable then "plasmax11" else "gnome-xorg";
       sddm.wayland.enable = lib.mkForce false;
     };
   };
@@ -39,26 +39,20 @@
   environment.sessionVariables.GSK_RENDERER = "gl";
 
   modules = {
-    desktop = {
-      browsers = {
-        firefox.enable = true;
+    programs = {
+      dev = {
+        node.enable = true;
       };
-      media.recording = {
+      firefox.enable = true;
+      git.enable = true;
+      gpg.enable = true;
+      neovim.enable = true;
+      pass.enable = true;
+      recording = {
         audio.enable = true;
       };
     };
-    dev = {
-      node.enable = true;
-    };
-    editors = {
-      neovim.enable = true;
-    };
-    security = {
-      gpg.enable = true;
-      pass.enable = true;
-    };
     shell = {
-      git.enable = true;
       zsh.enable = true;
     };
   };

hosts/library/default.nix

@@ -172,7 +172,7 @@
 
   modules = {
     podman.enable = true;
-    security = {
+    programs = {
       gpg.enable = true;
     };
     shell = {

hosts/odyssey/default.nix

@@ -50,44 +50,37 @@
   };
 
   modules = {
-    desktop = {
-      apps.qbittorrent.enable = true;
-      browsers = {
-        firefox.enable = true;
+    programs = {
+      dev = {
+        node.enable = true;
       };
-      gaming = {
-        emulators = {
-          gamecube.enable = true;
-          ps2.enable = true;
-          ps3.enable = true;
-          psp.enable = true;
-          wii.enable = true;
-          xbox.enable = true;
-        };
-        lutris.enable = true;
+      emulators = {
+        gamecube.enable = true;
+        ps2.enable = true;
+        ps3.enable = true;
+        psp.enable = true;
+        wii.enable = true;
+        xbox.enable = true;
       };
-      media.graphics = {
+      firefox.enable = true;
+      git.enable = true;
+      gpg.enable = true;
+      graphics = {
         modeling.enable = true;
         raster.enable = true;
         vector.enable = true;
       };
-      media.recording = {
+      libreoffice.enable = true;
+      lutris.enable = true;
+      pass.enable = true;
+      neovim.enable = true;
+      qbittorrent.enable = true;
+      recording = {
         audio.enable = true;
         video.enable = true;
       };
-      office.libreoffice.enable = true;
-    };
-    dev = {
-      node.enable = true;
-    };
-    editors = {
-      neovim.enable = true;
     };
     hardware.presonus-studio.enable = true;
-    security = {
-      gpg.enable = true;
-      pass.enable = true;
-    };
     services = {
       borgmatic = {
         enable = true;
@@ -105,7 +98,6 @@
       gitea-runner.enable = true;
     };
     shell = {
-      git.enable = true;
       zsh.enable = true;
     };
   };

hosts/pi/default.nix

@@ -214,7 +214,7 @@
   };
 
   modules = {
-    networking = {
+    system = {
       wireless = {
         enable = true;
         interfaces = [ "wlan0" ];

hosts/server.nix

@@ -54,7 +54,7 @@
     ];
   };
 
-  modules.networking.tailscale = {
+  modules.services.tailscale = {
     enable = true;
     restrictSSH = false;
   };

hosts/vps1/default.nix

@@ -79,7 +79,6 @@
   };
 
   modules = rec {
-    databases.postgresql.enable = true;
     services = {
       borgmatic = {
         enable = true;
@@ -103,10 +102,11 @@
           signal = true;
           whatsapp = true;
         };
-        usePostgresql = databases.postgresql.enable;
+        usePostgresql = services.postgresql.enable;
       };
       nginx.enable = true;
       photoprism.enable = true;
+      postgresql.enable = true;
     };
   };