some reorganizing

flake.lock

@@ -75,11 +75,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": {
@@ -218,11 +218,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": {
@@ -331,19 +331,14 @@
           "nvim-nix",
           "nixvim",
           "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "nvim-nix",
-          "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": {
@@ -489,11 +484,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734862405,
-        "narHash": "sha256-bXZJvUMJ2A6sIpYcCUAGjYCD5UDzmpmQCdmJSkPhleU=",
+        "lastModified": 1736508663,
+        "narHash": "sha256-ZOaGwa+WnB7Zn3YXimqjmIugAnHePdXCmNu+AHkq808=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "cb27edb5221d2f2920a03155f8becc502cf60e35",
+        "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc",
         "type": "github"
       },
       "original": {
@@ -562,11 +557,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733570843,
-        "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=",
+        "lastModified": 1736370755,
+        "narHash": "sha256-iWcjToBpx4PUd74uqvIGAfqqVfyrvRLRauC/SxEKIF0=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "a35b08d09efda83625bef267eb24347b446c80b8",
+        "rev": "57733bd1dc81900e13438e5b4439239f1b29db0e",
         "type": "github"
       },
       "original": {
@@ -649,11 +644,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1735378670,
-        "narHash": "sha256-A8aQA+YhJfA8mUpzXOZdlXNnKiZg2EcpCn1srgtBjTs=",
+        "lastModified": 1736964246,
+        "narHash": "sha256-gb3ujURRlI/D5Jc8PUDOpJr8RyrTwnDDIDtnQK4upso=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "f4b0b81ef9eb4e37e75f32caf1f02d5501594811",
+        "rev": "5b068e7f8f2b6beaa1fafe0c8b3604b63bcccc2d",
         "type": "github"
       },
       "original": {
@@ -673,11 +668,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": {
@@ -716,11 +711,11 @@
         "nixvim": "nixvim"
       },
       "locked": {
-        "lastModified": 1736692407,
-        "narHash": "sha256-KiqAcwCXi6vEf1W74SfZWgiWV8oxr4uD8aALP4e23+k=",
+        "lastModified": 1737010726,
+        "narHash": "sha256-VEWuUAySZQJ8pIwdtLC9VSa/W0SjdKp1USomSuVVoSA=",
         "owner": "xunuwu",
         "repo": "nvim-nix",
-        "rev": "8ae275a311eb7b1f5b82c540f653a45742d7d256",
+        "rev": "641634583f3ff6181a23b95f9fc8ff8eb7bbdc4a",
         "type": "github"
       },
       "original": {
@@ -941,11 +936,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1734704479,
-        "narHash": "sha256-MMi74+WckoyEWBRcg/oaGRvXC9BVVxDZNRMpL+72wBI=",
+        "lastModified": 1736154270,
+        "narHash": "sha256-p2r8xhQZ3TYIEKBoiEhllKWQqWNJNoT9v64Vmg4q8Zw=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "65712f5af67234dad91a5a4baee986a8b62dbf8f",
+        "rev": "13c913f5deb3a5c08bb810efd89dc8cb24dd968b",
         "type": "github"
       },
       "original": {

flake.nix

@@ -1,32 +1,28 @@
 {
-  outputs = inputs:
-    inputs.flake-parts.lib.mkFlake {
-      inherit inputs;
-    } {
+  outputs = {
+    self,
+    flake-parts,
+    nixpkgs,
+    ...
+  } @ inputs: let
+    mylib = import ./lib nixpkgs.lib;
+    systemProfiles = mylib.loadTree2 ./sys/profiles;
+    homeProfiles = mylib.loadTreeInf ./home/profiles;
+    homeSuites = mylib.loadBranch ./home/suites;
+  in
+    flake-parts.lib.mkFlake {inherit inputs;} {
       systems = ["x86_64-linux"];
 
-      imports = [./nix/machines];
+      flake._mylib = mylib; # for debugging :3
+      flake.nixosConfigurations = mylib.loadConfigurations ./sys/machines {
+        inherit inputs self systemProfiles homeProfiles homeSuites;
+      };
 
       perSystem = {pkgs, ...}: {
-        devShells.default = pkgs.mkShell {
-          packages = with pkgs; [
-            alejandra
-            nil
-            nixd
-            git
-            just
-            home-manager
-            sops
-            colmena
-            git-agecrypt
-            inputs.nvfetcher.packages.${pkgs.system}.default
+        imports = [
+          ./shells
+          ./pkgs
         ];
-          name = "dots";
-        };
-
-        packages = import ./pkgs {
-          inherit pkgs;
-        };
 
         formatter = pkgs.alejandra;
       };
@@ -34,47 +30,39 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    flake-parts = {
-      url = "github:hercules-ci/flake-parts";
-      inputs.nixpkgs-lib.follows = "nixpkgs";
-    };
+
+    flake-parts.url = "github:hercules-ci/flake-parts";
+    flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs";
+
     hardware.url = "github:nixos/nixos-hardware";
-    home-manager = {
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    nvim-nix = {
-      url = "github:xunuwu/nvim-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    stylix = {
-      url = "github:danth/stylix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    firefox-addons = {
-      url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    sops-nix = {
-      url = "github:Mic92/sops-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    nix-index-database = {
-      url = "github:Mic92/nix-index-database";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    nixos-wsl = {
-      url = "github:nix-community/NixOS-WSL/main";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    nvfetcher = {
-      url = "github:berberman/nvfetcher";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+
+    home-manager.url = "github:nix-community/home-manager";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
+
+    nvim-nix.url = "github:xunuwu/nvim-nix";
+    nvim-nix.inputs.nixpkgs.follows = "nixpkgs";
+
+    stylix.url = "github:danth/stylix";
+    stylix.inputs.nixpkgs.follows = "nixpkgs";
+
+    firefox-addons.url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
+    firefox-addons.inputs.nixpkgs.follows = "nixpkgs";
+
+    sops-nix.url = "github:Mic92/sops-nix";
+    sops-nix.inputs.nixpkgs.follows = "nixpkgs";
+
+    nix-index-database.url = "github:Mic92/nix-index-database";
+    nix-index-database.inputs.nixpkgs.follows = "nixpkgs";
+
+    nixos-wsl.url = "github:nix-community/NixOS-WSL/main";
+    nixos-wsl.inputs.nixpkgs.follows = "nixpkgs";
+
+    nvfetcher.url = "github:berberman/nvfetcher";
+    nvfetcher.inputs.nixpkgs.follows = "nixpkgs";
+
     vpn-confinement.url = "github:Maroka-chan/VPN-Confinement";
-    sobercookie = {
-      url = "github:xunuwu/sobercookie";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+
+    sobercookie.url = "github:xunuwu/sobercookie";
+    sobercookie.inputs.nixpkgs.follows = "nixpkgs";
   };
 }

home/editors/jetbrains/default.nix

@@ -1,5 +0,0 @@
-{pkgs, ...}: {
-  home.packages = with pkgs.jetbrains; [
-    rider
-  ];
-}

home/profiles/editors/jetbrains/rider.nix

@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  home.packages = with pkgs.jetbrains; [rider];
+}

home/profiles/kidney/default.nix

@@ -1,25 +0,0 @@
-{
-  inputs,
-  self,
-  ...
-}: {
-  imports = [
-    ../../editors/emacs.nix
-    ../../editors/nvim.nix
-
-    ../../terminal/shell/zsh.nix
-    ../../terminal/programs/xdg.nix
-    ../../terminal/programs/direnv.nix
-    ../../terminal/programs/comma.nix
-    ../../terminal/programs/tmux.nix
-    ../../terminal/programs/irssi.nix
-
-    ../../develop/langs/nix.nix
-    ../../develop/tools.nix
-    ../../develop/devenv.nix
-
-    ../../terminal/programs/git.nix
-    ../../terminal/programs/github.nix
-    ../../terminal/programs/lazygit.nix
-  ];
-}

home/profiles/nixdesk/default.nix

@@ -1,94 +0,0 @@
-{
-  self,
-  pkgs,
-  ...
-}: {
-  imports = [
-    ./defaults.nix
-
-    ../../secrets
-
-    ../../terminal/shell/zsh.nix
-
-    ../../terminal/programs/xdg.nix
-    ../../terminal/programs/direnv.nix
-    ../../terminal/programs/tmux.nix
-    ../../terminal/programs/comma.nix
-    ../../terminal/programs/zoxide.nix
-    ../../terminal/programs/tdf.nix
-    ../../terminal/programs/irssi.nix
-    ../../terminal/programs/git.nix
-    ../../terminal/programs/github.nix
-    ../../terminal/programs/lazygit.nix
-
-    ../../editors/emacs.nix
-    ../../editors/nvim.nix
-    ../../editors/jetbrains
-    ../../editors/jetbrains/android-studio.nix
-
-    ../../programs/browsers/firefox
-    ../../programs/browsers/tor.nix
-    ../../programs/browsers/chromium.nix
-
-    ../../terminal/emulator/wezterm.nix
-    ../../terminal/emulator/foot.nix
-
-    # desktop
-    ../../programs/desktop
-    ../../programs/desktop/sway
-
-    # development
-    ../../develop/common.nix
-    ../../develop/tools.nix
-    ../../develop/docs.nix
-    ../../develop/devenv.nix
-
-    ../../develop/langs/haskell.nix
-    ../../develop/langs/rust.nix
-    ../../develop/langs/uiua.nix
-    ../../develop/langs/nix.nix
-    ../../develop/langs/zig.nix
-    ../../develop/langs/lua.nix
-    ../../develop/langs/c.nix
-
-    # programs
-    ../../programs/misc/keepassxc.nix
-    ../../programs/misc/discord.nix
-    ../../programs/misc/element.nix
-    ../../programs/misc/obs.nix
-    ../../programs/misc/krita.nix
-    ../../programs/misc/foliate.nix
-    ../../programs/misc/blender.nix
-    ../../programs/misc/obsidian.nix
-    ../../programs/misc/pwvucontrol.nix
-    ../../programs/misc/qpwgraph.nix
-    ../../programs/misc/libreoffice.nix
-    ../../programs/music/puddletag.nix
-    ../../programs/music/picard.nix
-    ../../programs/music/cmus.nix
-    ../../programs/media/mpv.nix
-    ../../programs/media/jellyfin.nix
-
-    # gaming
-    ../../programs/games/lutris.nix
-    ../../programs/games/heroic.nix
-    ../../programs/games/minecraft.nix
-    ../../programs/games/roblox.nix
-    ../../programs/games/krunker.nix
-
-    ../../services/playerctl.nix
-    ../../services/polkit-agent.nix
-    ../../services/udiskie.nix # although i dont need this for usb memory, it is quite convenient for flashing qmk
-  ];
-
-  qt = {
-    enable = true;
-    platformTheme = {
-      name = "gtk3";
-      package = [
-        pkgs.libsForQt5.qtstyleplugins
-        pkgs.qt6.qtbase
-      ];
-    };
-  };
-}

home/suites/kidney/default.nix

@@ -0,0 +1,23 @@
+{homeProfiles, ...}: {
+  imports = with homeProfiles; [
+    default
+
+    editors.emacs
+    editors.nvim
+
+    terminal.shell.zsh
+    terminal.programs.xdg
+    terminal.programs.direnv
+    terminal.programs.comma
+    terminal.programs.tmux
+    terminal.programs.irssi
+
+    develop.langs.nix
+    develop.tools
+    develop.devenv
+
+    terminal.programs.git
+    terminal.programs.github
+    terminal.programs.lazygit
+  ];
+}

home/suites/nixdesk/default.nix

@@ -0,0 +1,97 @@
+{
+  self,
+  pkgs,
+  homeProfiles,
+  ...
+}: {
+  imports = with homeProfiles; [
+    ./defaults.nix
+
+    default
+
+    secrets.default
+
+    terminal.shell.zsh
+
+    terminal.programs.xdg
+    terminal.programs.direnv
+    terminal.programs.tmux
+    terminal.programs.comma
+    terminal.programs.zoxide
+    terminal.programs.tdf
+    terminal.programs.irssi
+    terminal.programs.git
+    terminal.programs.github
+    terminal.programs.lazygit
+
+    editors.emacs
+    editors.nvim
+    editors.jetbrains.rider
+    editors.jetbrains.android-studio
+
+    programs.browsers.firefox.default
+    programs.browsers.tor
+    programs.browsers.chromium
+
+    terminal.emulator.wezterm
+    terminal.emulator.foot
+
+    # desktop
+    programs.desktop.default
+    programs.desktop.sway.default
+
+    # development
+    develop.common
+    develop.tools
+    develop.docs
+    develop.devenv
+
+    develop.langs.haskell
+    develop.langs.rust
+    develop.langs.uiua
+    develop.langs.nix
+    develop.langs.zig
+    develop.langs.lua
+    develop.langs.c
+
+    # programs
+    programs.misc.keepassxc
+    programs.misc.discord
+    programs.misc.element
+    programs.misc.obs
+    programs.misc.krita
+    programs.misc.foliate
+    programs.misc.blender
+    programs.misc.obsidian
+    programs.misc.pwvucontrol
+    programs.misc.qpwgraph
+    programs.misc.libreoffice
+    programs.music.puddletag
+    programs.music.picard
+    programs.music.cmus
+    programs.media.mpv
+    programs.media.jellyfin
+
+    # gaming
+    programs.games.lutris
+    programs.games.heroic
+    programs.games.minecraft
+    programs.games.roblox
+    programs.games.krunker
+
+    services.playerctl
+    services.polkit-agent
+    services.udiskie # although i dont need this for usb memory, it is quite convenient for flashing qmk
+  ];
+
+  qt = {
+    enable = true;
+    platformTheme = {
+      name = "gtk3";
+      package = [
+        pkgs.libsForQt5.qtstyleplugins
+        pkgs.qt6.qtbase
+      ];
+    };
+  };
+}

lib/default.nix

@@ -0,0 +1,29 @@
+l: let
+  b = builtins;
+in rec {
+  loadBranch = branch:
+    l.mapAttrs' (leaf: _: {
+      name = l.removeSuffix ".nix" leaf;
+      value = /${branch}/${leaf};
+    }) (b.readDir /${branch});
+
+  loadTree2 = dir: (l.mapAttrs (branch: _: loadBranch /${dir}/${branch})) (b.readDir dir);
+
+  loadTreeInf = dir:
+    l.mapAttrs' (
+      name: value: {
+        name = l.removeSuffix ".nix" name;
+        value =
+          if value == "directory"
+          then loadTreeInf (dir + /${name})
+          else (dir + /${name});
+      }
+    ) (b.readDir dir);
+
+  loadConfigurations = dir: specialArgs:
+    (b.mapAttrs (name: _:
+      l.nixosSystem {
+        modules = [(dir + /${name})];
+        inherit specialArgs;
+      })) (b.readDir dir);
+}

nix/machines/default.nix

@@ -1,54 +0,0 @@
-{
-  self,
-  inputs,
-  ...
-}: let
-  inherit (inputs.nixpkgs.lib) nixosSystem;
-  specialArgs = {
-    inherit inputs self;
-  };
-in {
-  flake.nixosConfigurations = {
-    kidney = nixosSystem {
-      modules = [
-        ./kidney
-        {
-          home-manager = {
-            users.xun.imports = [
-              ../../home
-              ../../home/profiles/kidney
-              {home.stateVersion = "24.05";}
-            ];
-            extraSpecialArgs = specialArgs;
-          };
-        }
-      ];
-
-      inherit specialArgs;
-    };
-    nixdesk = nixosSystem {
-      modules = [
-        ./nixdesk
-        {
-          home-manager = {
-            backupFileExtension = "hm-backup";
-            users.xun.imports = [
-              ../../home
-              ../../home/profiles/nixdesk
-              inputs.sops-nix.homeManagerModules.sops
-              {home.stateVersion = "23.11";}
-            ];
-            extraSpecialArgs = specialArgs;
-          };
-        }
-      ];
-
-      inherit specialArgs;
-    };
-    hopper = nixosSystem {
-      modules = [./hopper];
-
-      inherit specialArgs;
-    };
-  };
-}

nix/machines/hopper/default.nix

@@ -1,34 +0,0 @@
-{inputs, ...}: {
-  imports = [
-    inputs.hardware.nixosModules.common-cpu-intel
-    inputs.vpn-confinement.nixosModules.default
-
-    ./hardware.nix
-    ./lab
-
-    ../../systemProfiles/secrets/default.nix
-    ../../systemProfiles/secrets/hopper/default.nix
-
-    ../../systemProfiles/core/security.nix
-    ../../systemProfiles/core/locale.nix
-    ../../systemProfiles/core/tools.nix
-    ../../systemProfiles/core/ssh.nix
-    ../../systemProfiles/core/deploy.nix
-
-    ../../systemProfiles/nix/default.nix # TODO slim this down
-
-    ../../systemProfiles/network/tailscale.nix
-    ../../systemProfiles/network/avahi.nix
-    ../../systemProfiles/network/networkd.nix
-
-    # ../../services/syncthing.nix # TODO make syncthing not rely on having "xun" user
-  ];
-
-  networking.hostName = "hopper";
-
-  swapDevices = [];
-
-  networking.interfaces.eno1.wakeOnLan.enable = true;
-
-  system.stateVersion = "23.11";
-}

nix/machines/kidney/default.nix

@@ -1,26 +0,0 @@
-{
-  imports = [
-    ./wsl.nix
-    ./hardware.nix
-    ./fonts.nix
-
-    ../../systemProfiles/core/tools.nix
-    ../../systemProfiles/core/users.nix
-    ../../systemProfiles/core/locale.nix
-
-    ../../systemProfiles/programs/tools.nix
-    ../../systemProfiles/programs/zsh.nix
-    ../../systemProfiles/programs/home-manager.nix
-    ../../systemProfiles/hardware/graphics.nix
-
-    ../../systemProfiles/services/flatpak.nix
-    ../../systemProfiles/services/xdg-portals.nix
-
-    ../../systemProfiles/nix/default.nix
-    ../../systemProfiles/nix/gc.nix
-  ];
-
-  networking.hostName = "kidney";
-
-  system.stateVersion = "24.05";
-}

nix/machines/nixdesk/default.nix

@@ -1,91 +0,0 @@
-{
-  lib,
-  inputs,
-  ...
-}: {
-  imports = [
-    ./hardware.nix
-    ./hibernate-boot.nix
-    ./samba-mount.nix
-
-    inputs.stylix.nixosModules.stylix
-
-    ../../systemProfiles/secrets/default.nix
-    ../../systemProfiles/secrets/nixdesk/default.nix
-
-    ../../systemProfiles/core/security.nix
-    ../../systemProfiles/core/users.nix
-    ../../systemProfiles/core/ssh.nix
-    ../../systemProfiles/core/locale.nix
-    ../../systemProfiles/nix/default.nix
-    ../../systemProfiles/programs/zsh.nix
-    ../../systemProfiles/core/tools.nix
-    ../../systemProfiles/core/compat.nix
-    ../../systemProfiles/core/boot.nix
-    ../../systemProfiles/core/docs.nix
-    ../../systemProfiles/core/gvfs.nix
-
-    ../../systemProfiles/nix/gc.nix
-
-    ../../systemProfiles/hardware/graphics.nix
-    ../../systemProfiles/hardware/steam-hardware.nix
-    ../../systemProfiles/hardware/bluetooth.nix
-    ../../systemProfiles/hardware/qmk.nix
-
-    ../../systemProfiles/network/networkd.nix
-    ../../systemProfiles/network/avahi.nix
-    ../../systemProfiles/network/localsend.nix
-    ../../systemProfiles/network/tailscale.nix
-    ../../systemProfiles/network/goldberg.nix
-
-    ../../systemProfiles/desktop/sway.nix
-
-    ../../systemProfiles/programs/dconf.nix
-    ../../systemProfiles/programs/fonts.nix
-    ../../systemProfiles/programs/home-manager.nix
-    # ../../systemProfiles/programs/qt.nix
-    ../../systemProfiles/programs/adb.nix
-    ../../systemProfiles/programs/kanidm.nix
-    ../../systemProfiles/programs/openrgb.nix
-    ../../systemProfiles/programs/tools.nix
-    ../../systemProfiles/programs/thunar.nix
-    ../../systemProfiles/programs/corectrl.nix
-
-    ../../systemProfiles/services/default.nix
-    ../../systemProfiles/services/pipewire.nix
-    ../../systemProfiles/services/flatpak.nix
-
-    ../../systemProfiles/services/syncthing.nix
-    ../../systemProfiles/services/virt/waydroid.nix
-    ../../systemProfiles/services/virt/virt-manager.nix
-    ../../systemProfiles/services/sunshine.nix
-    # ../../systemProfiles/network/wifi.nix
-
-    ../../systemProfiles/themes/dark.nix
-
-    ../../systemProfiles/programs/gamemode.nix
-    ../../systemProfiles/programs/gamescope.nix
-    ../../systemProfiles/programs/steam.nix
-    ../../systemProfiles/programs/RE/default.nix
-  ];
-
-  networking.hostName = "nixdesk";
-
-  nixpkgs.config = {
-    rocmSupport = true;
-    allowUnfreePredicate = pkg:
-      builtins.elem (lib.getName pkg) [
-        "steam"
-        "steam-unwrapped"
-        "discord"
-        "obsidian"
-        "rider"
-        "android-studio-stable"
-      ];
-    android_sdk.accept_license = true;
-  };
-
-  networking.interfaces.eno1.wakeOnLan.enable = true;
-
-  system.stateVersion = "23.11";
-}

nix/systemProfiles/services/virt/distrobox.nix

@@ -1,3 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = with pkgs; [distrobox];
-}

nix/systemProfiles/services/virt/docker.nix

@@ -1,6 +0,0 @@
-{pkgs, ...}: {
-  environment.systemPackages = with pkgs; [docker-compose];
-  virtualisation.docker = {
-    enable = true;
-  };
-}

nix/systemProfiles/services/virt/podman.nix

@@ -1,7 +0,0 @@
-{
-  virtualisation.podman = {
-    enable = true;
-    autoPrune.enable = true;
-    dockerSocket.enable = true;
-  };
-}

pkgs/default.nix

@@ -1,10 +1,12 @@
 {pkgs, ...}: let
   nv_generated = pkgs.callPackage ../_sources/generated.nix {};
 in {
+  packages = {
     jdnbtexplorer = pkgs.qt6Packages.callPackage ./jdnbtexplorer {};
     gamesand = pkgs.callPackage ./gamesand {};
     binaryninja-personal = pkgs.qt6Packages.callPackage ./binaryninja-personal {};
     krunker = pkgs.callPackage ./krunker {inherit nv_generated;};
     ida-pro = pkgs.callPackage ./ida-pro {};
     cartograph-cf = pkgs.callPackage ./cartograph-cf {};
+  };
 }

shells/default.nix

@@ -0,0 +1,12 @@
+{pkgs, ...}: {
+  devShells.default = pkgs.mkShell {
+    name = "dots";
+    packages = with pkgs; [
+      alejandra
+      git
+      just
+      home-manager
+      sops
+    ];
+  };
+}

sys/machines/hopper/default.nix

@@ -0,0 +1,38 @@
+{
+  inputs,
+  systemProfiles,
+  ...
+}: {
+  imports = with systemProfiles; [
+    inputs.hardware.nixosModules.common-cpu-intel
+    inputs.vpn-confinement.nixosModules.default
+
+    ./hardware.nix
+    ./lab
+
+    secrets.default
+    secrets.hopper
+
+    core.security
+    core.locale
+    core.tools
+    core.ssh
+    core.deploy
+
+    nix.default # TODO slim this down
+
+    network.tailscale
+    network.avahi
+    network.networkd
+
+    # services.syncthing # TODO make syncthing not rely on having "xun" user
+  ];
+
+  networking.hostName = "hopper";
+
+  swapDevices = [];
+
+  networking.interfaces.eno1.wakeOnLan.enable = true;
+
+  system.stateVersion = "23.11";
+}

sys/machines/kidney/default.nix

@@ -0,0 +1,41 @@
+{
+  specialArgs,
+  systemProfiles,
+  homeSuites,
+  ...
+}: {
+  imports = with systemProfiles; [
+    ./wsl.nix
+    ./hardware.nix
+    ./fonts.nix
+
+    core.tools
+    core.users
+    core.locale
+
+    programs.tools
+    programs.zsh
+    programs.home-manager
+    hardware.graphics
+
+    services.flatpak
+    services.xdg-portals
+
+    nix.default
+    nix.gc
+
+    {
+      home-manager = {
+        users.xun.imports = [
+          homeSuites.kidney
+          {home.stateVersion = "24.05";}
+        ];
+        extraSpecialArgs = specialArgs;
+      };
+    }
+  ];
+
+  networking.hostName = "kidney";
+
+  system.stateVersion = "24.05";
+}

sys/machines/nixdesk/default.nix

@@ -0,0 +1,107 @@
+{
+  lib,
+  inputs,
+  systemProfiles,
+  specialArgs,
+  self,
+  homeSuites,
+  ...
+}: {
+  imports = with systemProfiles; [
+    ./hardware.nix
+    ./hibernate-boot.nix
+    ./samba-mount.nix
+
+    inputs.stylix.nixosModules.stylix
+
+    secrets.default
+    secrets.nixdesk
+
+    core.security
+    core.users
+    core.ssh
+    core.locale
+    nix.default
+    programs.zsh
+    core.tools
+    core.compat
+    core.boot
+    core.docs
+    core.gvfs
+
+    nix.gc
+
+    hardware.graphics
+    hardware.steam-hardware
+    hardware.bluetooth
+    hardware.qmk
+
+    network.networkd
+    network.avahi
+    network.localsend
+    network.tailscale
+    network.goldberg
+
+    desktop.sway
+
+    programs.dconf
+    programs.fonts
+    programs.home-manager
+    # programs.qt
+    programs.adb
+    programs.kanidm
+    programs.openrgb
+    programs.tools
+    programs.thunar
+    programs.corectrl
+
+    services.default
+    services.pipewire
+    services.flatpak
+
+    services.syncthing
+    services.waydroid
+    services.virt-manager
+    services.sunshine
+    # network.wifi
+
+    themes.dark
+
+    programs.gamemode
+    programs.gamescope
+    programs.steam
+    programs.RE
+
+    {
+      home-manager = {
+        backupFileExtension = "hm-backup";
+        users.xun.imports = [
+          homeSuites.nixdesk
+          inputs.sops-nix.homeManagerModules.sops
+          {home.stateVersion = "23.11";}
+        ];
+        extraSpecialArgs = specialArgs;
+      };
+    }
+  ];
+
+  networking.hostName = "nixdesk";
+
+  nixpkgs.config = {
+    rocmSupport = true;
+    allowUnfreePredicate = pkg:
+      builtins.elem (lib.getName pkg) [
+        "steam"
+        "steam-unwrapped"
+        "discord"
+        "obsidian"
+        "rider"
+        "android-studio-stable"
+      ];
+    android_sdk.accept_license = true;
+  };
+
+  networking.interfaces.eno1.wakeOnLan.enable = true;
+
+  system.stateVersion = "23.11";
+}