1 files changed, 33 insertions, 85 deletions

diff --git a/flake.nix b/flake.nix
index 4341c03..da6353e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -115,88 +115,6 @@
       };
     };
 
-    nixosConfigurations = {
-      testDefault = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          self.nixosModules.test
-        ];
-      };
-
-      testPlainDesktop = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          self.nixosModules.test
-          self.nixosModules.profiles.desktop
-
-          ({ modulesPath, ... }: {
-            imports = [
-              (modulesPath + "/virtualisation/qemu-vm.nix")
-            ];
-
-            virtualisation.memorySize = 1024;
-            virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
-          })
-        ];
-      };
-
-      testFullDesktop = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          self.nixosModules.test
-          self.nixosModules.profiles.desktop
-          self.nixosModules.usecases.desktop.development
-          self.nixosModules.usecases.desktop.music
-          self.nixosModules.usecases.desktop.graphical.audioProduction
-          self.nixosModules.usecases.desktop.graphical.gaming
-          self.nixosModules.usecases.desktop.graphical.imageManipulation
-          self.nixosModules.usecases.desktop.graphical.kodi
-
-          ({ modulesPath, ... }: {
-            imports = [
-              (modulesPath + "/virtualisation/qemu-vm.nix")
-            ];
-
-            home-manager.users.minijackson.programs.beets.settings.acoustid.apikey = "0000000000";
-
-            virtualisation.memorySize = 2048;
-            virtualisation.qemu.options = [ "-vga none -device virtio-gpu-pci" ];
-          })
-        ];
-      };
-
-      testServer = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          self.nixosModules.test
-          self.nixosModules.profiles.server
-        ];
-      };
-
-      iso = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        modules = [
-          self.nixosModules.default
-          ({ modulesPath, ... }: {
-            imports = [
-              (modulesPath + "/installer/cd-dvd/installation-cd-base.nix")
-            ];
-
-            environment.etc.nixos-config-reborn.source = toString self;
-
-            isoImage.makeEfiBootable = true;
-            isoImage.makeUsbBootable = true;
-
-            home-manager.users.minijackson.home.stateVersion = "21.05";
-            home-manager.users.root.home.stateVersion = "21.05";
-
-            users.users.minijackson.initialHashedPassword = "";
-            users.users.root.initialHashedPassword = "";
-          })
-        ];
-      };
-    };
-
     templates = {
       desktop = {
         path = ./templates/desktop;
@@ -208,9 +126,15 @@
 
     hydraJobs =
       let
-        # Use the nixpkgs configuration of the testDefault machine, so that it
+        # Use the nixpkgs configuration of a test machine, so that it
         # contains the list of allowed unfree packages
-        nixpkgsConfig = self.nixosConfigurations.testDefault.config.nixpkgs.config;
+        nixpkgsConfig = let
+          testConfiguration = nixpkgs.lib.nixosSystem {
+            system = "x86_64-linux";
+            modules = [ self.nixosModules.test ];
+          };
+        in
+          testConfiguration.config.nixpkgs.config;
         pkgs = import nixpkgs { system = "x86_64-linux"; config = nixpkgsConfig; };
         inherit (pkgs) nixosTest;
       in
@@ -312,7 +236,31 @@
           '';
         };
 
-        isoImage.x86_64-linux = self.nixosConfigurations.iso.config.system.build.isoImage;
+        isoImage.x86_64-linux = let
+          isoSystem = nixpkgs.lib.nixosSystem {
+            system = "x86_64-linux";
+            modules = [
+              self.nixosModules.default
+              ({ modulesPath, ... }: {
+                imports = [
+                  (modulesPath + "/installer/cd-dvd/installation-cd-base.nix")
+                ];
+
+                environment.etc.nixos-config-reborn.source = toString self;
+
+                isoImage.makeEfiBootable = true;
+                isoImage.makeUsbBootable = true;
+
+                home-manager.users.minijackson.home.stateVersion = "21.05";
+                home-manager.users.root.home.stateVersion = "21.05";
+
+                users.users.minijackson.initialHashedPassword = "";
+                users.users.root.initialHashedPassword = "";
+              })
+            ];
+          };
+        in
+          isoSystem.config.system.build.isoImage;
       };
 
   };