use regular paths for profiles and suites and stuff instead of the horrible mess of attrsets i was generating

sys/machines/hopper/default.nix

@@ -6,50 +6,50 @@
   lib,
   ...
 }: {
-  imports = with systemProfiles; [
-    inputs.hardware.nixosModules.common-cpu-intel
-    inputs.vpn-confinement.nixosModules.default
-    inputs.nix-minecraft.nixosModules.minecraft-servers
+  imports =
+    [
+      inputs.hardware.nixosModules.common-cpu-intel
+      inputs.vpn-confinement.nixosModules.default
+      inputs.nix-minecraft.nixosModules.minecraft-servers
 
-    ./hardware.nix
-    ./lab
-    ./roblox-playtime.nix
-    ./desktop.nix
+      ./hardware.nix
+      ./lab
+      ./roblox-playtime.nix
+      ./desktop.nix
 
-    secrets.default
-    secrets.hopper
+      {
+        home-manager = {
+          backupFileExtension = "hm-backup";
+          users.desktop.imports = [
+            (homeSuites + /hopper)
+            {home.stateVersion = "24.11";}
+          ];
+          extraSpecialArgs = specialArgs;
+        };
+      }
+    ]
+    ++ (map (x: systemProfiles + x) [
+      /secrets/default.nix
+      /secrets/hopper/default.nix
 
-    programs.home-manager
+      /programs/home-manager.nix
 
-    core.security
-    core.locale
-    core.tools
-    core.ssh
-    core.deploy
+      /core/security.nix
+      /core/locale.nix
+      /core/tools.nix
+      /core/ssh.nix
+      /core/deploy.nix
 
-    hardware.graphics
-    hardware.steam-hardware
-    hardware.bluetooth
+      /hardware/graphics.nix
+      /hardware/steam-hardware.nix
+      /hardware/bluetooth.nix
 
-    nix.default # TODO slim this down
+      /nix/default.nix # TODO slim this down
 
-    network.tailscale
-    network.avahi
-    network.networkd
-
-    # services.syncthing # TODO make syncthing not rely on having "xun" user
-
-    {
-      home-manager = {
-        backupFileExtension = "hm-backup";
-        users.desktop.imports = [
-          homeSuites.hopper
-          {home.stateVersion = "24.11";}
-        ];
-        extraSpecialArgs = specialArgs;
-      };
-    }
-  ];
+      /network/tailscale.nix
+      /network/avahi.nix
+      /network/networkd.nix
+    ]);
 
   nixpkgs.config = {
     allowUnfreePredicate = pkg:

sys/machines/hopper/lab/acme.nix

@@ -3,7 +3,7 @@
   vars,
   ...
 }: let
-  inherit (vars.common) domain;
+  inherit (vars) domain;
 in {
   security.acme = {
     acceptTerms = true;

sys/machines/hopper/lab/caddy.nix

@@ -4,7 +4,7 @@
   inputs,
   ...
 }: let
-  inherit (vars.common) domain;
+  inherit (vars) domain;
   caddyPort = 8336;
   bridge = config.vpnNamespaces."wg".bridgeAddress;
 in {

sys/machines/hopper/lab/homepage.nix

@@ -3,7 +3,7 @@
   vars,
   ...
 }: let
-  inherit (vars.common) domain;
+  inherit (vars) domain;
   bridge = config.vpnNamespaces."wg".bridgeAddress;
 in {
   services.homepage-dashboard = {