Refactor modules into nixos and home-manager

Flake lock file updates:

• Updated input 'nixpkgs-unstable':
    'github:NixOS/nixpkgs/eb62e6aa39ea67e0b8018ba8ea077efe65807dc8?narHash=sha256-uQ%2BNQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140%3D' (2025-01-14)
  → 'github:NixOS/nixpkgs/5df43628fdf08d642be8ba5b3625a6c70731c19c?narHash=sha256-Tbk1MZbtV2s5aG%2BiM99U8FqwxU/YNArMcWAv6clcsBc%3D' (2025-01-16)
• Updated input 'nixvim':
    'github:nix-community/nixvim/2004ff4547f11d25da78f393fe797dde2b831ce7?narHash=sha256-G6/9vT12RAxkNWQPEX9p8tTx/i8jJcmISpbVDGbEPGc%3D' (2025-01-11)
  → 'github:nix-community/nixvim/c2ee71c814c9427d4991b9d58d412add9c5a1c56?narHash=sha256-Lq7PWAD%2BedeIpZKM7aresrwON%2BTdo3OMu1S2YX8AjjM%3D' (2025-01-17)

flake.lock

@@ -8,11 +8,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1723293904,
-        "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
+        "lastModified": 1736955230,
+        "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
+        "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
         "type": "github"
       },
       "original": {
@@ -87,11 +87,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728330715,
-        "narHash": "sha256-xRJ2nPOXb//u1jaBnDP56M7v5ldavjbtR6lfGqSvcKg=",
+        "lastModified": 1735644329,
+        "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "dd6b80932022cea34a019e2bb32f6fa9e494dfef",
+        "rev": "f7795ede5b02664b57035b3b757876703e2c3eac",
         "type": "github"
       },
       "original": {
@@ -107,11 +107,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735468753,
-        "narHash": "sha256-2dt1nOe9zf9pDkf5Kn7FUFyPRo581s0n90jxYXJ94l0=",
+        "lastModified": 1737038063,
+        "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "84a5b93637cc16cbfcc61b6e1684d626df61eb21",
+        "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2",
         "type": "github"
       },
       "original": {
@@ -123,11 +123,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1735511798,
-        "narHash": "sha256-U9WjPisByrvw8Kt6Ufg9kLrvg7uHPsFSyG93GR3I1iE=",
+        "lastModified": 1736899990,
+        "narHash": "sha256-S79Hqn2EtSxU4kp99t8tRschSifWD4p/51++0xNWUxw=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "097c98cb4a7568f6f83a43e37950c08b575dd126",
+        "rev": "91ca1f82d717b02ceb03a3f423cbe8082ebbb26d",
         "type": "github"
       },
       "original": {
@@ -190,11 +190,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733312601,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "lastModified": 1736143030,
+        "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de",
         "type": "github"
       },
       "original": {
@@ -231,18 +231,14 @@
         "nixpkgs": [
           "nixvim",
           "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "nixvim",
-          "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1734797603,
-        "narHash": "sha256-ulZN7ps8nBV31SE+dwkDvKIzvN6hroRY8sYOT0w+E28=",
+        "lastModified": 1735882644,
+        "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "f0f0dc4920a903c3e08f5bdb9246bb572fcae498",
+        "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656",
         "type": "github"
       },
       "original": {
@@ -318,11 +314,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735344290,
-        "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
+        "lastModified": 1736373539,
+        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
+        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
         "type": "github"
       },
       "original": {
@@ -340,11 +336,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735344290,
-        "narHash": "sha256-oJDtWPH1oJT34RJK1FSWjwX4qcGOBRkcNQPD0EbSfNM=",
+        "lastModified": 1736373539,
+        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "613691f285dad87694c2ba1c9e6298d04736292d",
+        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
         "type": "github"
       },
       "original": {
@@ -406,11 +402,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735218083,
-        "narHash": "sha256-MoUAbmXz9TEr7zlKDRO56DBJHe30+7B5X7nhXm+Vpc8=",
+        "lastModified": 1736370755,
+        "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "bc03f7818771a75716966ce8c23110b715eff2aa",
+        "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e",
         "type": "github"
       },
       "original": {
@@ -421,11 +417,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1735388221,
-        "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=",
+        "lastModified": 1736978406,
+        "narHash": "sha256-oMr3PVIQ8XPDI8/x6BHxsWEPBRU98Pam6KGVwUh8MPk=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "7c674c6734f61157e321db595dbfcd8523e04e19",
+        "rev": "b678606690027913f3434dea3864e712b862dde5",
         "type": "github"
       },
       "original": {
@@ -490,11 +486,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1735471104,
-        "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
+        "lastModified": 1737062831,
+        "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
+        "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c",
         "type": "github"
       },
       "original": {
@@ -521,11 +517,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1735669367,
-        "narHash": "sha256-tfYRbFhMOnYaM4ippqqid3BaLOXoFNdImrfBfCp4zn0=",
+        "lastModified": 1736916166,
+        "narHash": "sha256-puPDoVKxkuNmYIGMpMQiK8bEjaACcCksolsG36gdaNQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "edf04b75c13c2ac0e54df5ec5c543e300f76f1c9",
+        "rev": "e24b4c09e963677b1beea49d411cd315a024ad3a",
         "type": "github"
       },
       "original": {
@@ -549,11 +545,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1735389157,
-        "narHash": "sha256-3co5A7PUEN+Bm7b3/6BxFsmvplg3XYUNR2MzWnheZoE=",
+        "lastModified": 1737141914,
+        "narHash": "sha256-Lq7PWAD+edeIpZKM7aresrwON+Tdo3OMu1S2YX8AjjM=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "c8fa65c6ac35dba157de0873d645ab398c370123",
+        "rev": "c2ee71c814c9427d4991b9d58d412add9c5a1c56",
         "type": "github"
       },
       "original": {
@@ -573,11 +569,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733773348,
-        "narHash": "sha256-Y47y+LesOCkJaLvj+dI/Oa6FAKj/T9sKVKDXLNsViPw=",
+        "lastModified": 1735854821,
+        "narHash": "sha256-Iv59gMDZajNfezTO0Fw6LHE7uKAShxbvMidmZREit7c=",
         "owner": "NuschtOS",
         "repo": "search",
-        "rev": "3051be7f403bff1d1d380e4612f0c70675b44fc9",
+        "rev": "836908e3bddd837ae0f13e215dd48767aee355f0",
         "type": "github"
       },
       "original": {
@@ -596,11 +592,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735049224,
-        "narHash": "sha256-fWUd9kyXdepphJ7cCzOsuSo7l0kbFCkUqfgKqZyFZzE=",
+        "lastModified": 1736549395,
+        "narHash": "sha256-XzwkB62Tt5UYoL1jXiHzgk/qz2fUpGHExcSIbyGTtI0=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "d16bbded0ae452bc088489e7dca3ef58d8d1830b",
+        "rev": "a53af7f1514ef4cce8620a9d6a50f238cdedec8b",
         "type": "github"
       },
       "original": {
@@ -713,11 +709,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735135567,
-        "narHash": "sha256-8T3K5amndEavxnludPyfj3Z1IkcFdRpR23q+T0BVeZE=",
+        "lastModified": 1736154270,
+        "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "9e09d30a644c57257715902efbb3adc56c79cf28",
+        "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",
         "type": "github"
       },
       "original": {

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

modules/default.nix

@@ -1,53 +0,0 @@
-{
-  imports = [
-    ./options.nix
-    ./podman.nix
-    ./databases/postgresql.nix
-    ./desktop/gnome.nix
-    ./desktop/forensics.nix
-    ./desktop/hyprland.nix
-    ./desktop/kde.nix
-    ./desktop/mimeapps.nix
-    ./desktop/apps/qbittorrent.nix
-    ./desktop/apps/slack.nix
-    ./desktop/apps/thunderbird.nix
-    ./desktop/apps/zoom.nix
-    ./desktop/browsers/brave.nix
-    ./desktop/browsers/firefox.nix
-    ./desktop/gaming/emulators.nix
-    ./desktop/gaming/lutris.nix
-    ./desktop/gaming/steam.nix
-    ./desktop/media/graphics.nix
-    ./desktop/media/recording.nix
-    ./desktop/office/libreoffice.nix
-    ./dev/cc.nix
-    ./dev/java.nix
-    ./dev/lua.nix
-    ./dev/node.nix
-    ./dev/python.nix
-    ./dev/rust.nix
-    ./dev/scala.nix
-    ./dev/shell.nix
-    ./dev/zig.nix
-    ./editors/neovim
-    ./editors/vscode.nix
-    ./hardware/presonus-studio.nix
-    ./networking/netbird.nix
-    ./networking/tailscale.nix
-    ./networking/wireless.nix
-    ./security/gpg.nix
-    ./security/pass.nix
-    ./services/borgmatic
-    ./services/chrony
-    ./services/coturn
-    ./services/gitea
-    ./services/gitea-runner
-    ./services/headscale
-    ./services/mail
-    ./services/matrix
-    ./services/nginx
-    ./services/photoprism
-    ./shell/git
-    ./shell/zsh
-  ];
-}

modules/home-manager/default.nix

@@ -0,0 +1,33 @@
+{
+  imports = [
+    ./options.nix
+    ./programs/brave.nix
+    ./programs/dev/cc.nix
+    ./programs/dev/java.nix
+    ./programs/dev/lua.nix
+    ./programs/dev/node.nix
+    ./programs/dev/python.nix
+    ./programs/dev/rust.nix
+    ./programs/dev/scala.nix
+    ./programs/dev/shell.nix
+    ./programs/dev/zig.nix
+    ./programs/emulators.nix
+    ./programs/firefox.nix
+    ./programs/forensics.nix
+    ./programs/git
+    ./programs/gpg.nix
+    ./programs/graphics.nix
+    ./programs/libreoffice.nix
+    ./programs/lutris.nix
+    ./programs/neovim.nix
+    ./programs/pass.nix
+    ./programs/qbittorrent.nix
+    ./programs/recording.nix
+    ./programs/slack.nix
+    ./programs/steam.nix
+    ./programs/thunderbird.nix
+    ./programs/vscode.nix
+    ./programs/zoom.nix
+    ./shell/zsh
+  ];
+}

modules/home-manager/programs/brave.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.browsers.brave;
+let cfg = config.modules.programs.brave;
 in {
-  options.modules.desktop.browsers.brave = {
+  options.modules.programs.brave = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/dev/cc.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.cc;
+let cfg = config.modules.programs.dev.cc;
 in {
-  options.modules.dev.cc = {
+  options.modules.programs.dev.cc = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/dev/java.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.java;
+let cfg = config.modules.programs.dev.java;
 in {
-  options.modules.dev.java = {
+  options.modules.programs.dev.java = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/dev/lua.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.lua;
+let cfg = config.modules.programs.dev.lua;
 in {
-  options.modules.dev.lua = {
+  options.modules.programs.dev.lua = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/dev/node.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.node;
+let cfg = config.modules.programs.dev.node;
 in {
-  options.modules.dev.node = {
+  options.modules.programs.dev.node = {
     enable = lib.mkOption {
       default = false;
       example = true;
@@ -11,7 +11,7 @@ in {
 
   config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
-      nodejs_latest
+      nodejs_22
     ];
   };
 }

modules/home-manager/programs/dev/python.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.python;
+let cfg = config.modules.programs.dev.python;
 in {
-  options.modules.dev.python = {
+  options.modules.programs.dev.python = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/dev/rust.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.rust;
+let cfg = config.modules.programs.dev.rust;
 in {
-  options.modules.dev.rust = {
+  options.modules.programs.dev.rust = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/dev/scala.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.scala;
+let cfg = config.modules.programs.dev.scala;
 in {
-  options.modules.dev.scala = {
+  options.modules.programs.dev.scala = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/dev/shell.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.shell;
+let cfg = config.modules.programs.dev.shell;
 in {
-  options.modules.dev.shell = {
+  options.modules.programs.dev.shell = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/dev/zig.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.dev.zig;
+let cfg = config.modules.programs.dev.zig;
 in {
-  options.modules.dev.zig = {
+  options.modules.programs.dev.zig = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/emulators.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.gaming.emulators;
+let cfg = config.modules.programs.emulators;
 in {
-  options.modules.desktop.gaming.emulators = {
+  options.modules.programs.emulators = {
     ds.enable       = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/firefox.nix

@@ -1,8 +1,8 @@
 { config, lib, self, ... }:
 
-let cfg = config.modules.desktop.browsers.firefox;
+let cfg = config.modules.programs.firefox;
 in {
-  options.modules.desktop.browsers.firefox = {
+  options.modules.programs.firefox = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/forensics.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.forensics;
+let cfg = config.modules.programs.forensics;
 in {
-  options.modules.desktop.forensics = {
+  options.modules.programs.forensics = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/git/default.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.shell.git;
+let cfg = config.modules.programs.git;
 in {
-  options.modules.shell.git = {
+  options.modules.programs.git = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/gpg.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.security.gpg;
+let cfg = config.modules.programs.gpg;
 in {
-  options.modules.security.gpg = {
+  options.modules.programs.gpg = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/graphics.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.media.graphics;
+let cfg = config.modules.programs.graphics;
 in {
-  options.modules.desktop.media.graphics = {
+  options.modules.programs.graphics = {
     modeling.enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/libreoffice.nix

@@ -1,7 +1,7 @@
 { config, lib, pkgs, ... }:
 
 let
-  cfg = config.modules.desktop.office.libreoffice;
+  cfg = config.modules.programs.libreoffice;
   # libreoffice-gtk4 = pkgs.libreoffice.override {
   #   extraMakeWrapperArgs = [
   #     "--set SAL_USE_VCLPLUGIN gtk4"
@@ -20,7 +20,7 @@ let
   #   });
   # };
 in {
-  options.modules.desktop.office.libreoffice = {
+  options.modules.programs.libreoffice = {
     enable = lib.mkOption {
       default = false;
       example = true;
@@ -29,7 +29,7 @@ in {
 
   config = lib.mkIf cfg.enable {
     user.packages = with pkgs; [
-      (if config.modules.desktop.kde.enable == true then libreoffice-qt else libreoffice)
+      (if config.modules.system.desktop.kde.enable == true then libreoffice-qt else libreoffice)
       hunspell
       hunspellDicts.en-gb-large
       hunspellDicts.en-us-large

modules/home-manager/programs/lutris.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.gaming.lutris;
+let cfg = config.modules.programs.lutris;
 in {
-  options.modules.desktop.gaming.lutris = {
+  options.modules.programs.lutris = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/neovim.nix

@@ -1,9 +1,9 @@
 { config, lib, pkgs, ... }:
 
 let
-  cfg = config.modules.editors.neovim;
+  cfg = config.modules.programs.neovim;
 in {
-  options.modules.editors.neovim = {
+  options.modules.programs.neovim = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/pass.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.security.pass;
+let cfg = config.modules.programs.pass;
 in {
-  options.modules.security.pass = {
+  options.modules.programs.pass = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/qbittorrent.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.apps.qbittorrent;
+let cfg = config.modules.programs.qbittorrent;
 in {
-  options.modules.desktop.apps.qbittorrent = {
+  options.modules.programs.qbittorrent = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/recording.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.media.recording;
+let cfg = config.modules.programs.recording;
 in {
-  options.modules.desktop.media.recording = {
+  options.modules.programs.recording = {
     audio.enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/slack.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.apps.slack;
+let cfg = config.modules.programs.slack;
 in {
-  options.modules.desktop.apps.slack = {
+  options.modules.programs.slack = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/steam.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.gaming.steam;
+let cfg = config.modules.programs.steam;
 in {
-  options.modules.desktop.gaming.steam = {
+  options.modules.programs.steam = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/thunderbird.nix

@@ -1,8 +1,8 @@
 { config, lib, self, ... }:
 
-let cfg = config.modules.desktop.apps.thunderbird;
+let cfg = config.modules.programs.thunderbird;
 in {
-  options.modules.desktop.apps.thunderbird = {
+  options.modules.programs.thunderbird = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/vscode.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.editors.vscode;
+let cfg = config.modules.programs.vscode;
 in {
-  options.modules.editors.vscode = {
+  options.modules.programs.vscode = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/home-manager/programs/zoom.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.apps.zoom;
+let cfg = config.modules.programs.zoom;
 in {
-  options.modules.desktop.apps.zoom = {
+  options.modules.programs.zoom = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/nixos/default.nix

@@ -0,0 +1,24 @@
+{
+  imports = [
+    ./hardware/presonus-studio
+    ./podman.nix
+    ./services/borgmatic.nix
+    ./services/chrony.nix
+    ./services/coturn.nix
+    ./services/gitea.nix
+    ./services/gitea-runner.nix
+    ./services/headscale.nix
+    ./services/mail.nix
+    ./services/matrix.nix
+    ./services/netbird.nix
+    ./services/nginx.nix
+    ./services/photoprism.nix
+    ./services/postgresql.nix
+    ./services/tailscale.nix
+    ./system/desktop/gnome.nix
+    ./system/desktop/hyprland.nix
+    ./system/desktop/kde.nix
+    ./system/desktop/mimeapps.nix
+    ./system/wireless.nix
+  ];
+}

modules/nixos/services/netbird.nix

@@ -1,10 +1,10 @@
 { config, lib, self, ... }:
 
 let
-  cfg = config.modules.networking.netbird;
+  cfg = config.modules.services.netbird;
   hostname = config.networking.hostName;
 in {
-  options.modules.networking.netbird = {
+  options.modules.services.netbird = {
     enable = lib.mkEnableOption "netbird";
     coordinatorDomain = lib.mkOption {
       type = lib.types.str;

modules/nixos/services/postgresql.nix

@@ -5,9 +5,9 @@
 }:
 
 let
-  cfg = config.modules.databases.postgresql;
+  cfg = config.modules.services.postgresql;
 in {
-  options.modules.databases.postgresql = {
+  options.modules.services.postgresql = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/nixos/services/tailscale.nix

@@ -1,11 +1,11 @@
 { config, lib, pkgs, self, ... }:
 
 let
-  cfg = config.modules.networking.tailscale;
+  cfg = config.modules.services.tailscale;
   headscale = "https://headscale.vimium.net";
   hostname = config.networking.hostName;
 in {
-  options.modules.networking.tailscale = {
+  options.modules.services.tailscale = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/nixos/system/desktop/gnome.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, self, ... }:
 
-let cfg = config.modules.desktop.gnome;
+let cfg = config.modules.system.desktop.gnome;
 in {
-  options.modules.desktop.gnome = {
+  options.modules.system.desktop.gnome = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/nixos/system/desktop/hyprland.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.hyprland;
+let cfg = config.modules.system.desktop.hyprland;
 in {
-  options.modules.desktop.hyprland = {
+  options.modules.system.desktop.hyprland = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/nixos/system/desktop/kde.nix

@@ -1,8 +1,8 @@
 { config, lib, pkgs, ... }:
 
-let cfg = config.modules.desktop.kde;
+let cfg = config.modules.system.desktop.kde;
 in {
-  options.modules.desktop.kde = {
+  options.modules.system.desktop.kde = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/nixos/system/desktop/mimeapps.nix

@@ -1,11 +1,11 @@
 { config, lib, pkgs, ... }:
 
 let
-  cfg = config.modules.desktop.mimeapps;
+  cfg = config.modules.system.desktop.mimeapps;
   avApp = "io.github.celluloid_player.Celluloid.desktop";
   imageApp = "org.gnome.eog.desktop";
 in {
-  options.modules.desktop.mimeapps = {
+  options.modules.system.desktop.mimeapps = {
     enable = lib.mkOption {
       default = false;
       example = true;

modules/nixos/system/wireless.nix

@@ -2,9 +2,9 @@
 
 with lib;
 
-let cfg = config.modules.networking.wireless;
+let cfg = config.modules.system.wireless;
 in {
-  options.modules.networking.wireless = {
+  options.modules.system.wireless = {
     enable = mkOption {
       default = false;
       example = true;