refactor(dotfiles): separate registry validation

This commit is contained in:
2026-10-03 20:03:44 -04:00
parent 987b87cbab
commit a459cdb2b7
2 changed files with 19 additions and 19 deletions

View File

@@ -20,14 +20,12 @@ let
]; ];
}).config; }).config;
data = validate ( validate = import ./registry/validation.nix { inherit definitions lib; };
lib.mapAttrs (
data = lib.mapAttrs (
registryName: _registry: registryName: _registry:
lib.mapAttrs (hostName: host: host.config.registry.${registryName}.${hostName} or { }) hosts lib.mapAttrs (hostName: host: host.config.registry.${registryName}.${hostName} or { }) hosts
) definitions ) definitions;
);
validate = import ./registry/validation.nix { inherit definitions lib; };
in in
{ {
types = lib.mapAttrs (_name: definition: definition.type) definitions; types = lib.mapAttrs (_name: definition: definition.type) definitions;
@@ -46,7 +44,10 @@ in
) definitions; ) definitions;
}; };
collected = data // { collected =
assert validate data;
data
// {
join = join =
host: entry: host: entry:
lib.filterAttrs (_name: value: value != null) ( lib.filterAttrs (_name: value: value != null) (

View File

@@ -36,9 +36,8 @@ data:
let let
assertions = validationAssertions data; assertions = validationAssertions data;
in in
assert lib.assertMsg (lib.all (assertion: assertion.assertion) assertions) ( lib.assertMsg (lib.all (assertion: assertion.assertion) assertions) (
lib.concatMapStringsSep "\n" (assertion: assertion.message) ( lib.concatMapStringsSep "\n" (assertion: assertion.message) (
lib.filter (assertion: !assertion.assertion) assertions lib.filter (assertion: !assertion.assertion) assertions
) )
); )
data