diff --git a/deployment/data-model-test.nix b/deployment/data-model-test.nix index 4edec009..c5411688 100644 --- a/deployment/data-model-test.nix +++ b/deployment/data-model-test.nix @@ -127,7 +127,10 @@ in }; environments.single-nixos-vm = environment: { _class = "fediversity-environment"; - resources.shell.login-shell.username = "operator"; + resources.shell.login-shell = { + username = "operator"; + wheel = false; # FIXME: default needs the type uncommented + }; implementation = requests: { _class = "nixos"; users.users = ( diff --git a/deployment/data-model.nix b/deployment/data-model.nix index f18223b4..cd0d7b77 100644 --- a/deployment/data-model.nix +++ b/deployment/data-model.nix @@ -149,19 +149,24 @@ in Setting this is optional, but provides a place to declare that information for programmatic use in the resource mapping. ''; # TODO: maybe transpose, and group the resources by type instead - type = attrsOf ( - attrTag ( - lib.mapAttrs ( - _name: resource: - mkOption { - type = submoduleWith { - class = "fediversity-resource-policy"; - modules = [ resource.policy ]; - }; - } - ) config.resources - ) - ); + # # FIXME: error: The option `environments.single-nixos-vm.resources.shell.login-shell.apply' does not exist. Definition values: + # # - In `': + # # However there are no options defined in `environments.single-nixos-vm.resources.shell.login-shell'. Are you sure you've + # # declared your options properly? This can happen if you e.g. declared your options in `types.submodule' + # # under `config' rather than `options'. + # type = attrsOf ( + # attrTag ( + # lib.mapAttrs ( + # _name: resource: + # mkOption { + # type = submoduleWith { + # class = "fediversity-resource-policy"; + # modules = [ resource.policy ]; + # }; + # } + # ) config.resources + # ) + # ); }; implementation = mkOption { description = "Mapping of resources required by applications to available resources; the result can be deployed";