From 0473021e085528a85e5a913b472715e69bdc9823 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sat, 29 Oct 2022 22:28:35 +0200 Subject: [PATCH 1/2] feat: change drive in srv0 --- nix/os/devices/srv0.home-ch.stefanjunker.de/hw.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nix/os/devices/srv0.home-ch.stefanjunker.de/hw.nix b/nix/os/devices/srv0.home-ch.stefanjunker.de/hw.nix index 902519b..78ca098 100644 --- a/nix/os/devices/srv0.home-ch.stefanjunker.de/hw.nix +++ b/nix/os/devices/srv0.home-ch.stefanjunker.de/hw.nix @@ -20,7 +20,7 @@ in hardware.opinionatedDisk = { enable = true; encrypted = false; - diskId = "ata-Crucial_CT750MX300SSD1_16161311C7A6"; + diskId = "usb-JMicron_Generic_0123456789ABCDEF-0:0"; }; boot.initrd.availableKernelModules = stage1Modules; From 429a85060daf976e0c792710165ef58246e6c973 Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Sun, 30 Oct 2022 13:48:13 +0100 Subject: [PATCH 2/2] WIP --- nix/os/devices/srv0.home-ch.stefanjunker.de/boot.nix | 3 +++ nix/os/devices/srv0.home-ch.stefanjunker.de/hw.nix | 6 ++++++ nix/os/devices/steveej-rmvbl-sdep0/hw.nix | 1 + 3 files changed, 10 insertions(+) diff --git a/nix/os/devices/srv0.home-ch.stefanjunker.de/boot.nix b/nix/os/devices/srv0.home-ch.stefanjunker.de/boot.nix index cd4c05f..1e933e1 100644 --- a/nix/os/devices/srv0.home-ch.stefanjunker.de/boot.nix +++ b/nix/os/devices/srv0.home-ch.stefanjunker.de/boot.nix @@ -4,5 +4,8 @@ { boot.loader.grub.efiSupport = true; + boot.loader.grub.efiInstallAsRemovable = lib.mkForce true; + boot.loader.efi.canTouchEfiVariables = lib.mkForce false; + boot.extraModulePackages = [ ]; } diff --git a/nix/os/devices/srv0.home-ch.stefanjunker.de/hw.nix b/nix/os/devices/srv0.home-ch.stefanjunker.de/hw.nix index 78ca098..c711971 100644 --- a/nix/os/devices/srv0.home-ch.stefanjunker.de/hw.nix +++ b/nix/os/devices/srv0.home-ch.stefanjunker.de/hw.nix @@ -11,7 +11,13 @@ let "virtio_pci" "virtio_ring" "virtio" + "scsi_mod" + "uas" + "usb_storage" + + "xhci_hcd" + "xhci_pci" ]; in diff --git a/nix/os/devices/steveej-rmvbl-sdep0/hw.nix b/nix/os/devices/steveej-rmvbl-sdep0/hw.nix index d105279..71e983e 100644 --- a/nix/os/devices/steveej-rmvbl-sdep0/hw.nix +++ b/nix/os/devices/steveej-rmvbl-sdep0/hw.nix @@ -4,4 +4,5 @@ # TASK: new device hardware.opinionatedDisk.diskId = "usb-SanDisk_Extreme_Pro_12345978EC62-0:0"; hardware.opinionatedDisk.encrypted = true; + hardware.enableRedistributableFirmware = true; }