diff --git a/flake.nix b/flake.nix index b312e5b..f724624 100644 --- a/flake.nix +++ b/flake.nix @@ -78,13 +78,7 @@ hydraJobs.hosts = builtins.mapAttrs ( _: host: host.config.system.build.toplevel ) self.nixosConfigurations; - hydraJobs.isos = - let - hosts = self.nixosConfigurations; - in - { - installer-graphical = hosts.installer-graphical.config.system.build.isoImage; - installer-minimal = hosts.installer-minimal.config.system.build.isoImage; - }; + + hydraJobs.isos.installer = self.nixosConfigurations.installer.config.system.build.isoImage; }; } diff --git a/hosts/installer-minimal/configuration.nix b/hosts/installer-minimal/configuration.nix deleted file mode 100644 index a960dc1..0000000 --- a/hosts/installer-minimal/configuration.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ lib, nixpkgs-flake, ... }: -{ - imports = [ - "${nixpkgs-flake}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix" - ../../shared/base.nix - ]; - - isoImage.squashfsCompression = "gzip -Xcompression-level 1"; - networking.networkmanager.enable = lib.mkForce false; - - #Many installs will need this, and it won't hurt either way - services.qemuGuest.enable = true; -} diff --git a/hosts/installer-minimal/state.nix b/hosts/installer-minimal/state.nix deleted file mode 100644 index ffcd441..0000000 --- a/hosts/installer-minimal/state.nix +++ /dev/null @@ -1 +0,0 @@ -{ } diff --git a/hosts/installer-graphical/configuration.nix b/hosts/installer/configuration.nix similarity index 82% rename from hosts/installer-graphical/configuration.nix rename to hosts/installer/configuration.nix index fa64922..67b0cd7 100644 --- a/hosts/installer-graphical/configuration.nix +++ b/hosts/installer/configuration.nix @@ -1,13 +1,11 @@ { nixpkgs-flake, ... }: { imports = [ - "${nixpkgs-flake}/nixos/modules/installer/cd-dvd/installation-cd-graphical-combined.nix" ../../shared/base.nix + "${nixpkgs-flake}/nixos/modules/installer/cd-dvd/installation-cd-graphical-combined.nix" ]; + services.qemuGuest.enable = true; isoImage.squashfsCompression = "gzip -Xcompression-level 1"; networking.wireless.enable = false; - - #Many installs will need this, and it won't hurt either way - services.qemuGuest.enable = true; } diff --git a/hosts/installer-graphical/state.nix b/hosts/installer/state.nix similarity index 100% rename from hosts/installer-graphical/state.nix rename to hosts/installer/state.nix