diff --git a/flake.nix b/flake.nix index 7b90db8..46ee8d6 100644 --- a/flake.nix +++ b/flake.nix @@ -47,10 +47,6 @@ ./modules agenix.nixosModules.default ]; - - attrs_vm_info = listInfoToAttrs (get_info ./hosts/vm) { isVm = true; }; - attrs_physique_info = listInfoToAttrs (get_info ./hosts/physiques) { isVm = false; }; - attrs_all_info = attrs_physique_info // attrs_vm_info; in (attrsToNixosSystem ./hosts/vm attrs_all_info attrs_vm_info baseModules) // (attrsToNixosSystem ./hosts/physiques attrs_all_info attrs_physique_info baseModules) diff --git a/lib/info.nix b/lib/info.nix index b3cd64f..b689add 100644 --- a/lib/info.nix +++ b/lib/info.nix @@ -19,9 +19,6 @@ let warnIf warnIfNot ; -in -rec { - infoRequired = { name = isString; description = isString; @@ -61,7 +58,8 @@ rec { ); listInfoToAttrs = infos: add: listToAttrs (map (info: nameValuePair info.name (info // add)) infos); - +in +rec { attrsToNixosSystem = path: all_hosts: hosts: baseModules: mapAttrs ( @@ -78,4 +76,7 @@ rec { } ) (filterAttrs (name: info: !(info.isDebian or false)) hosts); + attrs_vm_info = listInfoToAttrs (get_info ../hosts/vm) { isVm = true; }; + attrs_physique_info = listInfoToAttrs (get_info ../hosts/physiques) { isVm = false; }; + attrs_all_info = attrs_physique_info // attrs_vm_info; }