Feat(clanServices): expose all other instance options than nixosModule
This is usefull for augmenting the perInstance module
This commit is contained in:
@@ -254,8 +254,7 @@ in
|
||||
default = [ ];
|
||||
type = types.listOf (types.deferredModule);
|
||||
};
|
||||
}
|
||||
)
|
||||
})
|
||||
];
|
||||
};
|
||||
};
|
||||
@@ -646,15 +645,14 @@ in
|
||||
let
|
||||
instanceRes = roleCfg.perInstance instanceName machineName;
|
||||
in
|
||||
{
|
||||
instanceRes
|
||||
// {
|
||||
nixosModule = {
|
||||
imports = [
|
||||
# Result of the applied 'perInstance = {...}: { nixosModule = { ... }; }'
|
||||
instanceRes.nixosModule
|
||||
] ++ instanceCfg.roles.${roleName}.extraModules;
|
||||
};
|
||||
# TODO: nested services
|
||||
services = { };
|
||||
}
|
||||
|
||||
) instanceCfg.roles.${roleName}.machines or { };
|
||||
|
||||
Reference in New Issue
Block a user