refactor(guest): assemble guest modules

flake/default.nix

@@ -14,27 +14,23 @@ let
     root = self + "/modules";
   };
 
+  guestModules = guests.mkGuests {
+    root = self + "/guests";
+  };
+
   #----------------------------------------------------------
-  guestFiles = util.collectNixFiles (self + "/guests");
 
   collectedRegistry = registryAssembly.collect { hosts = self.nixosConfigurations; };
 
   specialArgs = {
     inherit
-      flake
       inputs
       self
+      util
       ;
     registry = collectedRegistry;
   };
 
-  flake = {
-    inherit (hosts) mkHosts;
-    inherit (guests) mkGuest;
-
-    inherit util;
-  };
-
   guests = import ./guest.nix {
     inherit
       inputs
@@ -51,10 +47,12 @@ let
       inputs
       lib
       specialArgs
-      guestFiles
+      guestModules
       registryAssembly
       ;
     repositoryModules = modules;
   };
 in
-flake
+{
+  inherit (hosts) mkHosts;
+}