diff --git a/morph/grid/hro-cloud/storage001-config.nix b/morph/grid/hro-cloud/storage001-config.nix index 39d6d1b2ae38e9ce76cddca5be8d9f3e88d8e079..0bd4c2fb022f2a789eae876773eeb33b1f6c476c 100644 --- a/morph/grid/hro-cloud/storage001-config.nix +++ b/morph/grid/hro-cloud/storage001-config.nix @@ -5,6 +5,4 @@ "prefixLength" = 24; "gateway" = "185.225.209.1"; "gatewayInterface" = "eno1"; - "grubDeviceID" = "nodev"; #might be wrong - "systemd-boot" = false; } diff --git a/morph/grid/hro-cloud/storage002-config.nix b/morph/grid/hro-cloud/storage002-config.nix index 9d04bbf8397084adc8d43027b26c0c464fa79930..3ae425ade41ab36156be67cce2ceb0e455b9290c 100644 --- a/morph/grid/hro-cloud/storage002-config.nix +++ b/morph/grid/hro-cloud/storage002-config.nix @@ -5,6 +5,4 @@ "prefixLength" = 29; "gateway" = "38.170.241.33"; "gatewayInterface" = "eno1"; - "grubDeviceID" = "nodev"; #nodev if we want to use efi (double check) - "systemd-boot" = false; } diff --git a/morph/grid/hro-cloud/storage003-config.nix b/morph/grid/hro-cloud/storage003-config.nix index 188bdd5ada59ffcbb80e6a5e4d6684c4767359d7..6893df50ce01642752eddfd8981f44a0f9471181 100644 --- a/morph/grid/hro-cloud/storage003-config.nix +++ b/morph/grid/hro-cloud/storage003-config.nix @@ -5,7 +5,6 @@ "prefixLength" = 24; "gateway" = "151.80.28.254"; "gatewayInterface" = "eno3"; - #"grubDeviceID" = "nodev"; "grubDeviceID" = "nvme-eui.e8238fa6bf530001001b448b463b77bf"; "systemd-boot" = true; } diff --git a/nixos/modules/100tb.nix b/nixos/modules/100tb.nix index 55da37836c4654da6d32bba2376e88637b7b1927..505fe27071d8f15460cfa70bcc2d6e26a46d2c2c 100644 --- a/nixos/modules/100tb.nix +++ b/nixos/modules/100tb.nix @@ -68,10 +68,11 @@ let { type = lib.types.str; example = "wwn-0x5000c500936410b9"; description = "The ID of the disk on which to install grub."; + default = "nodev"; }; systemd-boot = lib.mkOption { type = lib.types.bool; - example = false; + default = false; description = "Fill later"; }; @@ -110,7 +111,7 @@ in { { boot.loader.grub.enable = true; boot.loader.grub.version = 2; boot.loader.grub.device = if cfg.grubDeviceID == "nodev" then "nodev" else "/dev/disk/by-id/${cfg.grubDeviceID}"; - boot.loader.systemd-boot.enable = if cfg.systemd-boot == "" then false else cfg.systemd-boot; + boot.loader.systemd-boot.enable = cfg.systemd-boot; boot.loader.timeout = 10; networking.firewall.enable = false;