deployment/data-model-test.nix

@@ -1,5 +1,4 @@
 let
-  sources = import ../npins;
   inherit (import ../default.nix { }) pkgs inputs;
   inherit (pkgs) lib;
   inherit (lib) mkOption types;
@@ -70,11 +69,7 @@ in
                       };
                     };
                     config = {
-                      resource-type = types.deferredModuleWith {
+                      resource-type = types.raw; # TODO: splice out the user type from NixOS
-                        staticModules = import "${sources.nixpkgs}/nixos/modules/module-list.nix" ++ [
-                          { _class = "nixos"; }
-                        ];
-                      };
                       apply =
                         requests:
                         let

deployment/data-model.nix

@@ -31,7 +31,6 @@ let
       inputs.nixops4.modules.nixops4Deployment.default
 
       {
-        _class = "nixops4Deployment";
         _module.args = {
           resourceProviderSystem = builtins.currentSystem;
           resources = { };
@@ -41,6 +40,8 @@ let
   };
 in
 {
+  _class = "nixops4Deployment";
+
   options = {
     resources = mkOption {
       description = "Collection of deployment resources that can be required by applications and policed by hosting providers";