flake.nix

@@ -80,7 +80,9 @@
     in
     {
       # Every host under hosts/ is discovered and built.
-      nixosConfigurations = flake.mkHosts (self + "/hosts");
+      nixosConfigurations = flake.mkHosts {
+        root = self + "/hosts";
+      };
 
       # A project shell for agent-local resources that should travel with this
       # checkout rather than the operator's global profile.

flake/default.nix

@@ -51,7 +51,6 @@ let
     inherit
       inputs
       lib
-      self
       specialArgs
       guestFiles
       registryAssembly

flake/host.nix

@@ -1,46 +1,51 @@
 {
   inputs,
   lib,
-  self,
   specialArgs,
   repositoryModules,
+
+  # TODO refactor guests
   guestFiles,
+  # TODO refactor registry
   registryAssembly,
 }:
 let
   mkHost =
     {
-      hostName,
+      root,
-      system ? "x86_64-linux",
+      name,
     }:
-    inputs.nixpkgs.lib.nixosSystem {
+    lib.nixosSystem {
-      inherit system specialArgs;
+      inherit specialArgs;
       modules =
-        [
+        guestFiles
-          repositoryModules
-        ]
-        ++ guestFiles
         ++ [
           inputs.chaotic.nixosModules.default
           inputs.disko.nixosModules.disko
           inputs.sops-nix.nixosModules.sops
           inputs.stylix.nixosModules.stylix
-          registryAssembly.module
+
-          (self + "/hosts/${hostName}")
+          repositoryModules
+
+          # TODO: refactor
+          registryAssembly.module (root + "/${name}")
+
           {
-            networking.hostName = hostName;
+            networking.hostName = name;
             modules.host.enable = true;
           }
         ];
     };
-
-  mkHosts =
-    hostsDir:
-    let
-      hostNames = lib.attrNames (lib.filterAttrs (_name: type: type == "directory") (builtins.readDir hostsDir));
-    in
-    lib.genAttrs hostNames (hostName: mkHost { inherit hostName; });
 in
 {
-  inherit mkHosts;
+  mkHosts =
+    { root }:
+    let
+      directories = lib.filterAttrs (_name: type: type == "directory") (builtins.readDir root);
+      names = lib.attrNames directories;
+    in
+    lib.genAttrs names (
+      name:
+      mkHost { inherit root name; }
+    );
 }