From 76b30f5b562489d638ddf82c8ae8223b494289a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Kurucz?= Date: Wed, 18 Dec 2024 16:09:48 +0100 Subject: [PATCH] Remove usage of `boot.initrd.availableKernelModules = lib.mkForce [` This should make it easier for users of the module to add their own additional initrd modules, e.g. for disk encryption. The ISO should be reproducible and have the following SHA256 hash: ed08f4ba281f39ae3ae910263d6b6e9391a15b44faade869997f005d5b8b75be --- iso.nix | 2 ++ modules/x1e80100.nix | 9 ++------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/iso.nix b/iso.nix index 93acc84..7711d0e 100644 --- a/iso.nix +++ b/iso.nix @@ -5,6 +5,8 @@ boot.supportedFilesystems.zfs = lib.mkForce false; boot.supportedFilesystems.cifs = lib.mkForce false; + hardware.enableAllHardware = lib.mkForce false; + # For some reason the adsp booting up messes with USB boot, so disable it. boot.blacklistedKernelModules = [ "qcom_q6v5_pas" ]; diff --git a/modules/x1e80100.nix b/modules/x1e80100.nix index 530e73c..da4eab1 100644 --- a/modules/x1e80100.nix +++ b/modules/x1e80100.nix @@ -1,13 +1,8 @@ { pkgs, lib, ... }: { - boot.initrd.availableKernelModules = lib.mkForce [ - # Needed by the NixOS iso for booting in general - "squashfs" - "iso9660" - "uas" - "overlay" - + boot.initrd.includeDefaultModules = false; + boot.initrd.availableKernelModules = [ # Definitely needed for USB: "usb_storage" "phy_qcom_qmp_combo"