motiejus
/
config
1
Fork 0
Code Packages Releases Activity

wip zfs

This commit is contained in:
Motiejus Jakštys 2023-11-28 00:49:49 +02:00
parent fb310f9e29
commit 71c8c13265
3 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hosts/fra1-a/configuration.nix
View File

@ -11,7 +11,6 @@
enable = true; enable = true;
devNodes = "/dev/disk/by-id/"; devNodes = "/dev/disk/by-id/";
bootDevices = ["scsi-0QEMU_QEMU_HARDDISK_36151096"]; bootDevices = ["scsi-0QEMU_QEMU_HARDDISK_36151096"];
forceNoDev2305 = true;
immutable = false; immutable = false;
availableKernelModules = ["xhci_pci" "virtio_pci" "virtio_scsi" "usbhid" "sr_mod" "virtio_gpu"]; availableKernelModules = ["xhci_pci" "virtio_pci" "virtio_scsi" "usbhid" "sr_mod" "virtio_gpu"];
removableEfi = true; removableEfi = true;

1
hosts/fwminex/configuration.nix
View File

@ -11,7 +11,6 @@ in {
devNodes = "/dev/disk/by-id/"; devNodes = "/dev/disk/by-id/";
bootDevices = ["nvme-Samsung_SSD_970_EVO_Plus_2TB_S6P1NS0TA01331A"]; bootDevices = ["nvme-Samsung_SSD_970_EVO_Plus_2TB_S6P1NS0TA01331A"];
immutable = false; immutable = false;
forceNoDev2305 = true;
availableKernelModules = ["usb_storage" "sd_mod" "xhci_pci" "thunderbolt" "nvme" "usbhid"]; availableKernelModules = ["usb_storage" "sd_mod" "xhci_pci" "thunderbolt" "nvme" "usbhid"];
removableEfi = true; removableEfi = true;
partitionScheme = { partitionScheme = {

10
modules/base/boot/default.nix
View File

@ -26,11 +26,6 @@ in {
description = "Specify boot devices"; description = "Specify boot devices";
type = types.nonEmptyListOf types.str; type = types.nonEmptyListOf types.str;
}; };
forceNoDev2305 = mkOption {
description = "https://github.com/NixOS/nixpkgs/issues/222491";
type = types.bool;
default = false;
};
availableKernelModules = mkOption { availableKernelModules = mkOption {
type = types.nonEmptyListOf types.str; type = types.nonEmptyListOf types.str;
default = ["uas" "nvme" "ahci"]; default = ["uas" "nvme" "ahci"];
@ -137,10 +132,7 @@ in {
generationsDir.copyKernels = true; generationsDir.copyKernels = true;
grub = { grub = {
enable = true; enable = true;
devices = devices = map (diskName: cfg.devNodes + diskName) cfg.bootDevices;
if cfg.forceNoDev2305
then ["nodev"]
else map (diskName: cfg.devNodes + diskName) cfg.bootDevices;
efiInstallAsRemovable = cfg.removableEfi; efiInstallAsRemovable = cfg.removableEfi;
copyKernels = true; copyKernels = true;
efiSupport = true; efiSupport = true;