diff --git a/flakeModules/clan.nix b/flakeModules/clan.nix index 554ef2ec8..0149201ed 100644 --- a/flakeModules/clan.nix +++ b/flakeModules/clan.nix @@ -60,7 +60,8 @@ in description = "Allows to include machine-specific modules i.e. machines.\${name} = { ... }"; }; inventory = mkOption { - type = types.submodule { imports = [ ../lib/inventory/build-inventory/interface.nix ]; }; + #type = types.submodule { imports = [ ../lib/inventory/build-inventory/interface.nix ]; }; + type = types.attrsOf types.raw; default = { }; description = '' An abstract service layer for consistently configuring distributed services across machine boundaries. @@ -117,10 +118,10 @@ in directory specialArgs machines - inventory pkgsForSystem meta ; + inventory = (lib.traceValSeq cfg.inventory); }; }; _file = __curPos.file; diff --git a/lib/inventory/build-inventory/default.nix b/lib/inventory/build-inventory/default.nix index e11c1af31..8067edef6 100644 --- a/lib/inventory/build-inventory/default.nix +++ b/lib/inventory/build-inventory/default.nix @@ -17,7 +17,7 @@ let availableTags = lib.foldlAttrs ( acc: _: v: v.tags or [ ] ++ acc - ) [ ] inventory.machines; + ) [ ] (lib.traceValSeq inventory.machines); tagMembers = builtins.attrNames ( lib.filterAttrs (_n: v: builtins.elem tag v.tags or [ ]) inventory.machines