data model: add classes

specifies classes in the data model, raising these to from `_class`
model attributes to `subModuleWith`'s `class` parameter where possible.

note: resource policy has remained as to use `deferredModuleWith`
(rather than `submoduleWith`) to ensure evaluation will go thru.

deployment/data-model-test.nix

@@ -68,26 +68,24 @@ in
                         default = false;
                       };
                     };
-                    config = {
-                      resource-type = types.raw; # TODO: splice out the user type from NixOS
-                      apply =
-                        requests:
-                        let
-                          # Filter out requests that need wheel if policy doesn't allow it
-                          validRequests = lib.filterAttrs (
-                            _name: req: !req.login-shell.wheel || config.wheel
-                          ) requests.resources;
-                        in
-                        lib.optionalAttrs (validRequests != { }) {
-                          ${config.username} = {
-                            isNormalUser = true;
-                            packages =
-                              with lib;
-                              attrValues (concatMapAttrs (_name: request: request.login-shell.packages) validRequests);
-                            extraGroups = lib.optional config.wheel "wheel";
-                          };
+                    config.resource-type = types.raw; # TODO: splice out the user type from NixOS
+                    config.apply =
+                      requests:
+                      let
+                        # Filter out requests that need wheel if policy doesn't allow it
+                        validRequests = lib.filterAttrs (
+                          _name: req: !req.login-shell.wheel || config.wheel
+                        ) requests.resources;
+                      in
+                      lib.optionalAttrs (validRequests != { }) {
+                        ${config.username} = {
+                          isNormalUser = true;
+                          packages =
+                            with lib;
+                            attrValues (concatMapAttrs (_name: request: request.login-shell.packages) validRequests);
+                          extraGroups = lib.optional config.wheel "wheel";
                         };
-                    };
+                      };
                   };
               };
               applications.hello =
@@ -153,7 +151,7 @@ in
           }
         );
         resources = fediversity.applications.hello.resources fediversity.example-configuration.applications.hello;
-        hello-shell = resources.resources.hello.login-shell;
+        hello-shell = (resources).resources.hello.login-shell;
         environment = fediversity.environments.single-nixos-vm.resources.operator-environment.login-shell;
         result = mkDeployment {
           modules = [
@@ -162,7 +160,7 @@ in
         };
 
       in
-      {
+      rec {
         number-of-resources = with lib; length (attrNames fediversity.resources);
         inherit (fediversity) example-configuration;
         hello-package-exists = hello-shell.packages ? hello;
@@ -174,7 +172,7 @@ in
           in
           {
             inherit (operator) isNormalUser;
-            packages = map (p: "${p.pname}") operator.packages;
+            packages = with lib; map (p: "${p.pname}") operator.packages;
             extraGroups = operator.extraGroups;
           };
         deployment = {

deployment/data-model.nix

@@ -33,6 +33,7 @@ let
       inputs.nixops4.modules.nixops4Deployment.default
 
       {
+        _class = "nixops4Deployment";
         _module.args = {
           resourceProviderSystem = builtins.currentSystem;
           resources = { };
@@ -77,7 +78,7 @@ in
                         # and then also rename this to be consistent with the application's resource mapping
                         options.apply = mkOption {
                           description = "Apply the policy to a request";
-                          type = functionTo policy.config.resource-type;
+                          type = with types; functionTo policy.config.resource-type;
                         };
                       })
                     ];