diff --git a/deployment/data-model.nix b/deployment/data-model.nix index 1b90edec..65f7f75b 100644 --- a/deployment/data-model.nix +++ b/deployment/data-model.nix @@ -16,15 +16,6 @@ let ; functionType = import ./function.nix; - application-requirements = { - _class = "fediversity-application-requirements"; - options.resources = mkOption { - # TODO: maybe transpose, and group the resources by type instead - type = attrsOf ( - attrTag (lib.mapAttrs (_name: resource: mkOption { type = resource.request; }) config.resources) - ); - }; - }; nixops4Deployment = import ./deployment.nix { inherit inputs; }; configuration = mkOption { @@ -114,7 +105,12 @@ in }; resources = mkOption { description = "Mapping of application configuration to deployment resources, a description of what an application needs to run"; - type = functionTo (types.submodule application-requirements); + # TODO: maybe transpose, and group the resources by type instead + type = functionTo ( + attrsOf ( + attrTag (lib.mapAttrs (_name: resource: mkOption { type = resource.request; }) config.resources) + ) + ); }; }; }