From 71c8c13265e9b2cc4d5380730b9fccdc3896b018 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <motiejus@jakstys.lt>
Date: Tue, 28 Nov 2023 00:49:49 +0200
Subject: [PATCH] wip zfs

---
 hosts/fra1-a/configuration.nix  |  1 -
 hosts/fwminex/configuration.nix |  1 -
 modules/base/boot/default.nix   | 10 +---------
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/hosts/fra1-a/configuration.nix b/hosts/fra1-a/configuration.nix
index e660b1c..7ab6b41 100644
--- a/hosts/fra1-a/configuration.nix
+++ b/hosts/fra1-a/configuration.nix
@@ -11,7 +11,6 @@
       enable = true;
       devNodes = "/dev/disk/by-id/";
       bootDevices = ["scsi-0QEMU_QEMU_HARDDISK_36151096"];
-      forceNoDev2305 = true;
       immutable = false;
       availableKernelModules = ["xhci_pci" "virtio_pci" "virtio_scsi" "usbhid" "sr_mod" "virtio_gpu"];
       removableEfi = true;
diff --git a/hosts/fwminex/configuration.nix b/hosts/fwminex/configuration.nix
index 9eb2d49..58498d4 100644
--- a/hosts/fwminex/configuration.nix
+++ b/hosts/fwminex/configuration.nix
@@ -11,7 +11,6 @@ in {
       devNodes = "/dev/disk/by-id/";
       bootDevices = ["nvme-Samsung_SSD_970_EVO_Plus_2TB_S6P1NS0TA01331A"];
       immutable = false;
-      forceNoDev2305 = true;
       availableKernelModules = ["usb_storage" "sd_mod" "xhci_pci" "thunderbolt" "nvme" "usbhid"];
       removableEfi = true;
       partitionScheme = {
diff --git a/modules/base/boot/default.nix b/modules/base/boot/default.nix
index 7e77c54..a35dfe6 100644
--- a/modules/base/boot/default.nix
+++ b/modules/base/boot/default.nix
@@ -26,11 +26,6 @@ in {
       description = "Specify boot devices";
       type = types.nonEmptyListOf types.str;
     };
-    forceNoDev2305 = mkOption {
-      description = "https://github.com/NixOS/nixpkgs/issues/222491";
-      type = types.bool;
-      default = false;
-    };
     availableKernelModules = mkOption {
       type = types.nonEmptyListOf types.str;
       default = ["uas" "nvme" "ahci"];
@@ -137,10 +132,7 @@ in {
           generationsDir.copyKernels = true;
           grub = {
             enable = true;
-            devices =
-              if cfg.forceNoDev2305
-              then ["nodev"]
-              else map (diskName: cfg.devNodes + diskName) cfg.bootDevices;
+            devices = map (diskName: cfg.devNodes + diskName) cfg.bootDevices;
             efiInstallAsRemovable = cfg.removableEfi;
             copyKernels = true;
             efiSupport = true;