further purge test machines from nixops

infra/flake-part.nix

@@ -14,33 +14,17 @@ let
     ;
   inherit (lib.attrsets) genAttrs;
 
-  ## Given a machine's name and whether it is a test VM, make a resource module,
+  ## Given a machine's name, make a resource module,
   ## except for its missing provider. (Depending on the use of that resource, we
   ## will provide a different one.)
   makeResourceModule =
-    { vmName, isTestVm }:
+    { vmName }:
     {
       _module.args = { inherit inputs; };
-      imports =
-        [
-          ./common/resource.nix
-        ]
-        ++ (
-          if isTestVm then
-            [
-              ./test-machines/${vmName}
-              {
-                nixos.module.users.users.root.openssh.authorizedKeys.keys = [
-                  # allow our panel vm access to the test machines
-                  (import ../keys).panel
-                ];
-              }
-            ]
-          else
-            [
-              ./machines/${vmName}
-            ]
-        );
+      imports = [
+        ./common/resource.nix
+        ./machines/${vmName}
+      ];
       fediversityVm.name = vmName;
     };
 
@@ -57,7 +41,6 @@ let
           inputs.nixops4-nixos.modules.nixops4Resource.nixos
           (makeResourceModule {
             inherit vmName;
-            isTestVm = false;
           })
         ];
       });
@@ -90,15 +73,15 @@ let
 
   ## Given a VM name, make a NixOS configuration for this machine.
   makeConfiguration =
-    isTestVm: vmName:
+    vmName:
     inputs.nixpkgs.lib.nixosSystem {
       modules = [
-        (makeResourceConfig { inherit vmName isTestVm; }).nixos.module
+        (makeResourceConfig { inherit vmName; }).nixos.module
       ];
     };
 
-  makeVmOptions = isTestVm: vmName: {
-    inherit ((makeResourceConfig { inherit vmName isTestVm; }).fediversityVm)
+  makeVmOptions = vmName: {
+    inherit ((makeResourceConfig { inherit vmName; }).fediversityVm)
       proxmox
       vmId
       description
@@ -116,24 +99,18 @@ let
   listSubdirectories = path: attrNames (filterAttrs (_: type: type == "directory") (readDir path));
 
   machines = listSubdirectories ./machines;
-  testMachines = listSubdirectories ./test-machines;
 
 in
 {
   flake.lib.makeInstallerIso = import ./makeInstallerIso.nix;
 
-  ## - Each normal or test machine gets a NixOS configuration.
-  ## - Each normal or test machine gets a VM options entry.
-  ## - Each normal machine gets a deployment.
-  ## - We add a “default” deployment with all normal machines.
-  ## - We add a “test” deployment with all test machines.
+  ## - Each machine gets a NixOS configuration.
+  ## - Each machine gets a VM options entry.
+  ## - Each machine gets a deployment.
+  ## - We add a “default” deployment with all infra machines.
   nixops4Deployments = genAttrs machines makeDeployment' // {
     default = makeDeployment machines;
   };
-  flake.nixosConfigurations =
-    genAttrs machines (makeConfiguration false)
-    // genAttrs testMachines (makeConfiguration true);
-  flake.vmOptions =
-    genAttrs machines (makeVmOptions false)
-    // genAttrs testMachines (makeVmOptions true);
+  flake.nixosConfigurations = genAttrs machines makeConfiguration;
+  flake.vmOptions = genAttrs machines makeVmOptions;
 }