diff --git a/src/dotfiles/registry/collection.nix b/src/dotfiles/registry/collection.nix index 14d6a67..83d08b7 100644 --- a/src/dotfiles/registry/collection.nix +++ b/src/dotfiles/registry/collection.nix @@ -59,14 +59,16 @@ let rawDeclarations = registryName: lib.mapAttrs (_hostName: host: host.config.registry.${registryName} or { }) hosts; + + join = + registry: host: entry: + lib.filterAttrs (_name: value: value != null) ( + lib.mapAttrs ( + registryName: _registry: (registry.${registryName}.${host} or { }).${entry} or null + ) definitions + ); in collectData // { - join = - host: entry: - lib.filterAttrs (_name: value: value != null) ( - lib.mapAttrs ( - registryName: _registry: (collectData.${registryName}.${host} or { }).${entry} or null - ) definitions - ); + join = host: entry: join collectData host entry; }