yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat(inventory/instances): map over all machines and return lazy attributes

Browse Source
This commit is contained in:
Johannes Kirschbauer
2025-06-03 17:36:03 +02:00
parent 2e2b90677e
commit 582841ba05
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/inventory/build-inventory/default.nix
View File

@@ -30,16 +30,13 @@ let
# config.distributedServices.allMachines.${name} or [ ]; # config.distributedServices.allMachines.${name} or [ ];
{ config, ... }: { config, ... }:
{ {
distributedServices = clanLib.inventory.mapInstances { distributedServices = clanLib.inventory.mapInstances {
inherit (config) inventory; inherit (config) inventory;
inherit localModuleSet; inherit localModuleSet;
inherit flakeInputs; inherit flakeInputs;
prefix = prefix ++ [ "distributedServices" ]; prefix = prefix ++ [ "distributedServices" ];
}; };
machines = lib.mapAttrs (_machineName: v: { machines = config.distributedServices.allMachines;
machineImports = v;
}) config.distributedServices.allMachines;
} }
) )

15
lib/inventory/distributed-service/inventory-adapter.nix
View File

@@ -157,6 +157,7 @@ in
modules = modules =
[ [
# Import the resolved module. # Import the resolved module.
# i.e. clan.modules.admin
(builtins.head instances).instance.resolvedModule (builtins.head instances).instance.resolvedModule
] # Include all the instances that correlate to the resolved module ] # Include all the instances that correlate to the resolved module
++ (builtins.map (v: { ++ (builtins.map (v: {
@@ -185,20 +186,18 @@ in
} }
) { } importedModuleWithInstances; ) { } importedModuleWithInstances;
# TODO: Return an attribute set of resources instead of a plain list of nixosModules allMachines = lib.mapAttrs (machineName: _: {
allMachines = lib.foldlAttrs ( # This is the list of nixosModules for each machine
machineImports = lib.foldlAttrs (
acc: _module_ident: eval: acc: _module_ident: eval:
acc acc ++ [ eval.config.result.final.${machineName}.nixosModule or {}]
// lib.mapAttrs ( ) [ ] importedModulesEvaluated;
machineName: result: acc.${machineName} or [ ] ++ [ result.nixosModule ] }) inventory.machines;
) eval.config.result.final
) { } importedModulesEvaluated;
in in
{ {
inherit inherit
importedModuleWithInstances importedModuleWithInstances
grouped grouped
allMachines allMachines
importedModulesEvaluated importedModulesEvaluated
; ;