deployment/data-model-test.nix

@@ -68,9 +68,8 @@ in
                         default = false;
                       };
                     };
-                    config = {
-                      resource-type = types.raw; # TODO: splice out the user type from NixOS
-                      apply =
+                    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
@@ -89,7 +88,6 @@ in
                       };
                   };
               };
-              };
               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

@@ -73,7 +73,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;
                       };
                     })
                   ];