feat(registry): add generic fleet namespace

lib/default.nix

@@ -14,11 +14,7 @@ let
     ;
 
   serviceIdentityRegistry = import ./service-identities.nix { inherit lib; };
-  registryLib = import ./registry.nix { inherit lib; };
-  registry = registryLib.load {
-    dir = self + "/registry";
-    args = { inherit lib; };
-  };
+  registry = import ./registry.nix { inherit lib self; };
   networkEndpoints = import ./network-endpoints.nix { inherit lib; };
   reverseProxyRoutes = import ./reverse-proxy-routes.nix { inherit lib; };
 

lib/registry.nix

@@ -1,4 +1,4 @@
-{ lib }:
+{ lib, self }:
 let
   inherit (lib)
     filterAttrs
@@ -20,23 +20,16 @@ let
       Lazily collected fleet-visible registry entries, nested by host and entry name.
     '';
   };
-in
-{
-  load =
-    {
-      dir,
-      args ? { },
-    }:
-    let
+
   definitions = mapAttrs' (
     name: type:
     let
-          path = dir + "/${name}";
+      path = self + "/registry/${name}";
     in
-        nameValuePair (registryName name) (import path args)
-      ) (filterAttrs (name: type: type == "regular" && hasSuffix ".nix" name) (builtins.readDir dir));
-    in
-    {
+    nameValuePair (registryName name) (import path { inherit lib; })
+  ) (filterAttrs (name: type: type == "regular" && hasSuffix ".nix" name) (builtins.readDir (self + "/registry")));
+in
+{
   inherit definitions;
 
   module = {
@@ -49,5 +42,4 @@ in
       registryName: _registry:
       mapAttrs (hostName: host: host.config.registry.${registryName}.${hostName} or { }) hosts
     ) definitions;
-    };
 }