From 067aa8908bd8f17f7eca731c2251fd9fabbebd68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 21 Jul 2024 16:20:42 +0200 Subject: [PATCH] move perlless profile to noninteractive profile this borked our iso --- nix/installer.nix | 8 +++----- nix/noninteractive.nix | 6 +++++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/nix/installer.nix b/nix/installer.nix index 56a2ab1..36f490f 100644 --- a/nix/installer.nix +++ b/nix/installer.nix @@ -2,7 +2,6 @@ config, lib, pkgs, - modulesPath, ... }: { @@ -21,6 +20,9 @@ documentation.enable = false; documentation.man.man-db.enable = false; + # make it easier to debug boot failures + boot.initrd.systemd.emergencyAccess = true; + environment.systemPackages = [ pkgs.nixos-install-tools # for zapping of disko @@ -31,10 +33,6 @@ imports = [ ./nix-settings.nix - # reduce closure size by removing perl - "${modulesPath}/profiles/perlless.nix" - # FIXME: we still are left with nixos-generate-config due to nixos-install-tools - { system.forbiddenDependenciesRegexes = lib.mkForce []; } ]; # Don't add nixpkgs to the image to save space, for our intended use case we don't need it diff --git a/nix/noninteractive.nix b/nix/noninteractive.nix index 0f6e954..a685e89 100644 --- a/nix/noninteractive.nix +++ b/nix/noninteractive.nix @@ -1,7 +1,7 @@ # This module optimizes for non-interactive deployments by remove some store paths # which are primarily useful for interactive installations. -{ lib, pkgs, ... }: +{ lib, pkgs, modulesPath, ... }: { disabledModules = [ # This module adds values to multiple lists (systemPackages, supportedFilesystems) @@ -12,6 +12,10 @@ imports = [ ./zfs-minimal.nix ./no-bootloaders.nix + # reduce closure size by removing perl + "${modulesPath}/profiles/perlless.nix" + # FIXME: we still are left with nixos-generate-config due to nixos-install-tools + { system.forbiddenDependenciesRegexes = lib.mkForce []; } ]; # among others, this prevents carrying a stdenv with gcc in the image