Inventory: fix roles config

2024-07-15 15:59:59 +02:00
parent 8e7a34af0d
commit 018f18a93e
2 changed files with 12 additions and 8 deletions
--- a/lib/inventory/build-inventory/default.nix
+++ b/lib/inventory/build-inventory/default.nix
@@ -85,8 +85,7 @@ let
            ) inverseRoles.${machineName} or [ ];

            roleServiceConfigs = builtins.map (
-              role:
-              serviceConfig.roles.${role}.config or { }
+              role: serviceConfig.roles.${role}.config or { }
            ) inverseRoles.${machineName} or [ ];
          in
          if isInService then
@@ -94,11 +93,13 @@ let
            ++ [
              {
                imports = [ clan-core.clanModules.${moduleName} ] ++ roleModules;
-                config.clan.${moduleName} = lib.mkMerge [
-                  globalConfig
-                  machineServiceConfig
-                  roleServiceConfigs
-                ];
+                config.clan.${moduleName} = lib.mkMerge (
+                  [
+                    globalConfig
+                    machineServiceConfig
+                  ]
+                  ++ roleServiceConfigs
+                );
              }
              {
                config.clan.inventory.services.${moduleName}.${instanceName} = {