un-nixops

deployment/check/common/deployerNode.nix

@@ -54,11 +54,8 @@ in
 
     system.extraDependencies =
       [
-        inputs.nixops4
+        sources.nixpkgs
-        inputs.nixops4-nixos
-        inputs.nixpkgs
 
-        sources.flake-parts
         sources.flake-inputs
         sources.git-hooks
 

deployment/check/data-model/common-nixosTest.nix

@@ -21,25 +21,17 @@ let
     optionalString
     ;
   inherit (hostPkgs)
-    runCommandNoCC
     writeText
-    system
     ;
 
   forConcat = xs: f: concatStringsSep "\n" (map f xs);
 
-  ## We will need to override some inputs by the empty flake, so we make one.
-  emptyFlake = runCommandNoCC "empty-flake" { } ''
-    mkdir $out
-    echo "{ outputs = { self }: {}; }" > $out/flake.nix
-  '';
-
 in
 {
   _class = "nixosTest";
 
   imports = [
-    ./sharedOptions.nix
+    ../common/sharedOptions.nix
   ];
 
   options = {
@@ -67,16 +59,15 @@ in
 
   config = {
     sourceFileset = fileset.unions [
-      # NOTE: not the flake itself; it will be overridden.
       ../../../mkFlake.nix
       ../../../flake.lock
       ../../../npins
+      ../../data-model.nix
+      ../../function.nix
 
-      ./sharedOptions.nix
+      ../common/sharedOptions.nix
-      ./targetNode.nix
+      ../common/targetNode.nix
-      ./targetResource.nix
+      ../common/targetResource.nix
-
-      (config.pathToCwd + "/flake-under-test.nix")
     ];
 
     acmeNodeIP = config.nodes.acme.networking.primaryIPAddress;
@@ -84,7 +75,7 @@ in
     nodes =
       {
         deployer = {
-          imports = [ ./deployerNode.nix ];
+          imports = [ ../common/deployerNode.nix ];
           _module.args = { inherit inputs sources; };
           enableAcme = config.enableAcme;
           acmeNodeIP = config.nodes.acme.networking.primaryIPAddress;
@@ -111,7 +102,7 @@ in
       //
 
         genAttrs config.targetMachines (_: {
-          imports = [ ./targetNode.nix ];
+          imports = [ ../common/targetNode.nix ];
           _module.args = { inherit inputs sources; };
           enableAcme = config.enableAcme;
           acmeNodeIP = if config.enableAcme then config.nodes.acme.networking.primaryIPAddress else null;
@@ -163,31 +154,8 @@ in
           deployer.succeed(f"echo '{host_key}' > ${config.pathFromRoot}/${tm}_host_key.pub")
         '')}
 
-      ## NOTE: This is super slow. It could probably be optimised in Nix, for
+      # with subtest("Override the flake and its lock"):
-      ## instance by allowing to grab things directly from the host's store.
+      #   deployer.succeed("cp ${config.pathFromRoot}/flake-under-test.nix flake.nix")
-      ##
-      ## NOTE: We use the repository as-is (cf `src` above), overriding only
-      ## `flake.nix` by our `flake-under-test.nix`. We also override the flake
-      ## lock file to use locally available inputs, as we cannot download them.
-      ##
-      with subtest("Override the flake and its lock"):
-        deployer.succeed("cp ${config.pathFromRoot}/flake-under-test.nix flake.nix")
-        deployer.succeed("""
-          nix flake lock --extra-experimental-features 'flakes nix-command' \
-            --offline -v \
-            --override-input nixops4 ${inputs.nixops4.packages.${system}.flake-in-a-bottle} \
-            \
-            --override-input nixops4-nixos ${inputs.nixops4-nixos} \
-            --override-input nixops4-nixos/flake-parts ${inputs.nixops4-nixos.inputs.flake-parts} \
-            --override-input nixops4-nixos/flake-parts/nixpkgs-lib ${inputs.nixops4-nixos.inputs.flake-parts.inputs.nixpkgs-lib} \
-            --override-input nixops4-nixos/nixops4-nixos ${emptyFlake} \
-            --override-input nixops4-nixos/nixpkgs ${inputs.nixops4-nixos.inputs.nixpkgs} \
-            --override-input nixops4-nixos/nixops4 ${
-              inputs.nixops4-nixos.inputs.nixops4.packages.${system}.flake-in-a-bottle
-            } \
-            --override-input nixops4-nixos/git-hooks-nix ${emptyFlake} \
-            ;
-        """)
 
       ${optionalString config.enableAcme ''
         with subtest("Set up handmade DNS"):

deployment/check/data-model/default.nix

@@ -6,7 +6,9 @@
 
 runNixOSTest {
   imports = [
-    ../common/nixosTest.nix
+    ../../data-model.nix
+    ../../function.nix
+    ./common-nixosTest.nix
     ./nixosTest.nix
   ];
   _module.args = { inherit inputs sources; };

deployment/check/data-model/deployment.nix

@@ -1,36 +1,40 @@
 {
   inputs,
-  sources,
+  # sources,
   lib,
-  providers,
+  # providers,
   ...
 }:
 
 let
-  inherit (import ./constants.nix) targetMachines pathToRoot pathFromRoot;
+  # inherit (import ./constants.nix) targetMachines pathToRoot pathFromRoot;
-in
+  eval =
-
+    module:
-{
+    (lib.evalModules {
-  providers = {
+      specialArgs = {
-    inherit (inputs.nixops4.modules.nixops4Provider) local;
+        inherit inputs;
-  };
-
-  resources = lib.genAttrs targetMachines (nodeName: {
-    type = providers.local.exec;
-
-    imports = [
-      inputs.nixops4-nixos.modules.nixops4Resource.nixos
-      ../common/targetResource.nix
-    ];
-
-    _module.args = { inherit inputs sources; };
-
-    inherit nodeName pathToRoot pathFromRoot;
-
-    nixos.module =
-      { pkgs, ... }:
-      {
-        environment.systemPackages = [ pkgs.${nodeName} ];
       };
-  });
+      modules = [
+        module
+        ../../data-model.nix
+      ];
+    }).config;
+  fediversity = eval (
+    { ... }:
+    {
+      config = {
+        environments.single-nixos-vm =
+          { ... }:
+          {
+            implementation = requests: {
+              input = requests;
+              output = { };
+            };
+          };
+      };
+    }
+  );
+in
+fediversity.environments.single-nixos-vm.deployment {
+  enable = true;
 }

deployment/check/data-model/flake-under-test.nix

@@ -1,22 +0,0 @@
-{
-  inputs = {
-    nixops4.follows = "nixops4-nixos/nixops4";
-    nixops4-nixos.url = "github:nixops4/nixops4-nixos";
-  };
-
-  outputs =
-    inputs:
-    import ./mkFlake.nix inputs (
-      { inputs, sources, ... }:
-      {
-        imports = [
-          inputs.nixops4.modules.flake.default
-        ];
-
-        nixops4Deployments.check-deployment-basic = {
-          imports = [ ./deployment/check/basic/deployment.nix ];
-          _module.args = { inherit inputs sources; };
-        };
-      }
-    );
-}

deployment/check/data-model/nixosTest.nix

@@ -1,4 +1,7 @@
-{ inputs, lib, ... }:
+{
+  lib,
+  ...
+}:
 
 {
   _class = "nixosTest";
@@ -15,9 +18,6 @@
   nodes.deployer =
     { pkgs, ... }:
     {
-      environment.systemPackages = [
-        inputs.nixops4.packages.${pkgs.system}.default
-      ];
 
       # FIXME: sad times
       system.extraDependencies = with pkgs; [

deployment/data-model.nix

@@ -1,7 +1,6 @@
 {
   lib,
   config,
-  inputs,
   ...
 }:
 let
@@ -26,24 +25,7 @@ let
       );
     };
   };
-  nixops4Deployment = types.deferredModuleWith {
-    staticModules = [
-      inputs.nixops4.modules.nixops4Deployment.default
-
-      {
-        _class = "nixops4Deployment";
-        _module.args = {
-          resourceProviderSystem = builtins.currentSystem;
-          resources = { };
-        };
-      }
-    ];
-  };
   deployment = attrTag {
-    nixops4 = mkOption {
-      description = "A NixOps4 NixOS deployment. For an example, see https://github.com/nixops4/nixops4-nixos/blob/main/example/deployment.nix.";
-      type = nixops4Deployment;
-    };
   };
 in
 {