From 7fcecd0d4f084b4f7385b5d956b88829754ceea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 20 May 2023 01:53:53 +0200 Subject: [PATCH] Add iso jobs --- config/default.nix | 2 +- flake.nix | 23 +++++++++++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/config/default.nix b/config/default.nix index 3ffed333..a500984d 100644 --- a/config/default.nix +++ b/config/default.nix @@ -182,7 +182,7 @@ # Required for deployment and sops enable = true; passwordAuthentication = lib.mkIf (!config.c3d2.k-ot.enable) false; - permitRootLogin = "prohibit-password"; + permitRootLogin = lib.mkOverride 900 "prohibit-password"; }; portunus = with zentralwerk.lib.config.site.net.serv; { diff --git a/flake.nix b/flake.nix index 9517037d..4b41797f 100644 --- a/flake.nix +++ b/flake.nix @@ -414,6 +414,22 @@ ]; }; + iso = nixosSystem' { + modules = [ + ({ modulesPath, ... }: { + imports = lib.singleton "${modulesPath}/installer/cd-dvd/installation-cd-graphical-calamares-plasma5.nix"; + }) + ]; + }; + + iso-minimal = nixosSystem' { + modules = [ + ({ modulesPath, ... }: { + imports = lib.singleton "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"; + }) + ]; + }; + jabber = nixosSystem' { modules = [ { @@ -780,9 +796,12 @@ hydraJobs = lib.mapAttrs (_: nixos.lib.hydraJob) ( let - getBuildEntryPoint = _: nixosSystem: + getBuildEntryPoint = name: nixosSystem: let - cfg = nixosSystem.config.microvm.declaredRunner or nixosSystem.config.system.build.toplevel; + cfg = if (lib.hasPrefix "iso" name) then + nixosSystem.config.system.build.isoImage + else + nixosSystem.config.microvm.declaredRunner or nixosSystem.config.system.build.toplevel; in if nixosSystem.config.nixpkgs.system == "aarch64-linux" then # increase timeout for chromium