refactor(flake): assemble repository modules

flake/default.nix

@@ -6,10 +6,15 @@
 let
   # TODO: refactor the registry code
   registryAssembly = import ./registry.nix { inherit lib self; };
-  flakeLib = import ../lib { inherit lib; };
+  # TODO: remove this after the refactor of this file is done and clean
+  util = import ../lib { inherit lib; };
+  mkModules = import ./modules.nix { inherit util; };
 
-  moduleFiles = flakeLib.collectNixFiles (self + "/modules");
-  guestFiles = flakeLib.collectNixFiles (self + "/guests");
+  modules = mkModules {
+    root = self + "/modules";
+  };
+  repositoryModules = modules;
+  guestFiles = util.collectNixFiles (self + "/guests");
 
   collectedRegistry = registryAssembly.collect { hosts = self.nixosConfigurations; };
 
@@ -26,7 +31,7 @@ let
     inherit (hosts) mkHosts;
     inherit (guests) mkGuest;
 
-    lib = flakeLib;
+    inherit util;
   };
 
   guests = import ./guests.nix {
@@ -35,9 +40,9 @@ let
       lib
       self
       specialArgs
-      moduleFiles
+      repositoryModules
       registryAssembly
-      flakeLib
+      util
       ;
   };
 
@@ -47,7 +52,7 @@ let
       lib
       self
       specialArgs
-      moduleFiles
+      repositoryModules
       guestFiles
       registryAssembly
       ;