From e5f08ca335b665a20e2c25566e30b2189f57eabc Mon Sep 17 00:00:00 2001
From: Benoit Donneaux <benoit@leastauthority.com>
Date: Mon, 27 Nov 2023 14:28:33 +0100
Subject: [PATCH] Remove dup. bootloader config.
Signed-off-by: Benoit Donneaux <benoit@leastauthority.com>
---
morph/grid/hro-cloud/storage003-config.nix | 1 -
nixos/modules/100tb.nix | 7 -------
2 files changed, 8 deletions(-)
diff --git a/morph/grid/hro-cloud/storage003-config.nix b/morph/grid/hro-cloud/storage003-config.nix
index 6893df50..f5be748f 100644
--- a/morph/grid/hro-cloud/storage003-config.nix
+++ b/morph/grid/hro-cloud/storage003-config.nix
@@ -6,5 +6,4 @@
"gateway" = "151.80.28.254";
"gatewayInterface" = "eno3";
"grubDeviceID" = "nvme-eui.e8238fa6bf530001001b448b463b77bf";
- "systemd-boot" = true;
}
diff --git a/nixos/modules/100tb.nix b/nixos/modules/100tb.nix
index 6c86c8f2..12bb4b35 100644
--- a/nixos/modules/100tb.nix
+++ b/nixos/modules/100tb.nix
@@ -70,12 +70,6 @@ let
description = "The ID of the disk on which to install grub.";
default = "nodev";
};
- systemd-boot = lib.mkOption
- { type = lib.types.bool;
- default = false;
- description = "Whether to enable the systemd-boot (formerly gummiboot) EFI boot manager";
- };
-
};
in {
# Here we actually define the module's options. They're what we said they
@@ -111,7 +105,6 @@ 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 = cfg.systemd-boot;
boot.loader.timeout = 10;
networking.firewall.enable = false;
--
GitLab