From 742cafc426a3b38173047fdefc6f34511fd0bd15 Mon Sep 17 00:00:00 2001
From: Kiara Grouwstra <kiara@procolix.eu>
Date: Thu, 31 Jul 2025 15:54:31 +0200
Subject: [PATCH] put `config` stuff in an attrset

---
 deployment/data-model-test.nix | 42 +++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/deployment/data-model-test.nix b/deployment/data-model-test.nix
index 2a1c182b..5b4b9259 100644
--- a/deployment/data-model-test.nix
+++ b/deployment/data-model-test.nix
@@ -45,8 +45,10 @@ in
                         description = "Any options from NixOS";
                       };
                     };
-                    config.resource-type = types.raw; # TODO: what's the type of a NixOS configuration?
-                    config.apply = requests: lib.mkMerge (requests ++ [ config.extra-config ]);
+                    config = {
+                      resource-type = types.raw; # TODO: what's the type of a NixOS configuration?
+                      apply = requests: lib.mkMerge (requests ++ [ config.extra-config ]);
+                    };
                   };
               };
               resources.login-shell = {
@@ -82,24 +84,26 @@ in
                         default = false;
                       };
                     };
-                    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";
+                    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";
+                          };
                         };
-                      };
+                    };
                   };
               };
               applications.hello =