Inventory: fix roles config

inventory.json

@@ -19,7 +19,10 @@
         },
         "roles": {
           "default": {
-            "machines": ["minimal-inventory-machine"]
+            "machines": ["minimal-inventory-machine"],
+            "config": {
+              "packages": ["vim"]
+            }
           }
         },
         "machines": {

lib/inventory/build-inventory/default.nix

@@ -85,8 +85,7 @@ let
             ) inverseRoles.${machineName} or [ ];
 
             roleServiceConfigs = builtins.map (
-              role:
+              role: serviceConfig.roles.${role}.config or { }
-              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 [
+                config.clan.${moduleName} = lib.mkMerge (
-                  globalConfig
+                  [
-                  machineServiceConfig
+                    globalConfig
-                  roleServiceConfigs
+                    machineServiceConfig
-                ];
+                  ]
+                  ++ roleServiceConfigs
+                );
               }
               {
                 config.clan.inventory.services.${moduleName}.${instanceName} = {