revert submodule wrapper to align with module functions already doing types #2

Closed
kiara wants to merge 37 commits from kiara/Fediversity:fix-submodule-type into main
Showing only changes of commit ba047997f2 - Show all commits

View file

@ -23,6 +23,33 @@ in
{ config, ... }: { config, ... }:
{ {
config = { config = {
resources.nixos-configuration = {
description = "An entire NixOS configuration";
request =
{ ... }:
{
_class = "fediversity-resource-request";
options.config = mkOption {
description = "Any options from NixOS";
};
};
policy =
{ config, ... }:
{
_class = "fediversity-resource-policy";
options = {
extra-config = mkOptions {
description = "Any options from NixOS";
};
apply = mkOption {
type = with types; functionTo raw;
default = requests: lib.mkMerge (requests ++ [ config.extra-config ]);
};
};
};
};
resources.login-shell = { resources.login-shell = {
description = "The operator needs to be able to log into the shell"; description = "The operator needs to be able to log into the shell";
request = request =
@ -137,7 +164,8 @@ in
{ {
inherit (fediversity) example-deployment; inherit (fediversity) example-deployment;
}; };
expected = { expected =
}; {
};
}; };
} }