From 775e4573b75cb6e3c8fd35b0dabc90aa6ebacb14 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Sun, 3 Jan 2021 16:01:15 +0800 Subject: [PATCH] Revert "nixops: switch to grub" Tickles UEFI bugs in EFI motherboards This reverts commit 4a758ec029ba64ec4ddbb4b7c8cec573ecdcd652. --- nixops/chiron-hardware-configuration.nix | 4 +--- nixops/hera-hardware-configuration.nix | 4 +--- nixops/hestia-hardware-configuration.nix | 4 +--- nixops/juno-hardware-configuration.nix | 4 +--- nixops/zeus-hardware-configuration.nix | 4 +--- 5 files changed, 5 insertions(+), 15 deletions(-) diff --git a/nixops/chiron-hardware-configuration.nix b/nixops/chiron-hardware-configuration.nix index ac138db4..719dac47 100644 --- a/nixops/chiron-hardware-configuration.nix +++ b/nixops/chiron-hardware-configuration.nix @@ -25,8 +25,6 @@ nix.maxJobs = lib.mkDefault 16; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - boot.loader.grub.enable = true; - boot.loader.grub.device = "nodev"; - boot.loader.grub.efiSupport = true; + boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; } diff --git a/nixops/hera-hardware-configuration.nix b/nixops/hera-hardware-configuration.nix index 11375929..d43953c8 100644 --- a/nixops/hera-hardware-configuration.nix +++ b/nixops/hera-hardware-configuration.nix @@ -25,8 +25,6 @@ nix.maxJobs = lib.mkDefault 16; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - boot.loader.grub.enable = true; - boot.loader.grub.device = "nodev"; - boot.loader.grub.efiSupport = true; + boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; } diff --git a/nixops/hestia-hardware-configuration.nix b/nixops/hestia-hardware-configuration.nix index fd91e9d4..69d5e892 100644 --- a/nixops/hestia-hardware-configuration.nix +++ b/nixops/hestia-hardware-configuration.nix @@ -25,8 +25,6 @@ nix.maxJobs = lib.mkDefault 16; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - boot.loader.grub.enable = true; - boot.loader.grub.device = "nodev"; - boot.loader.grub.efiSupport = true; + boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; } diff --git a/nixops/juno-hardware-configuration.nix b/nixops/juno-hardware-configuration.nix index d55d3d99..bb8e0dae 100644 --- a/nixops/juno-hardware-configuration.nix +++ b/nixops/juno-hardware-configuration.nix @@ -25,8 +25,6 @@ nix.maxJobs = lib.mkDefault 8; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - boot.loader.grub.enable = true; - boot.loader.grub.device = "nodev"; - boot.loader.grub.efiSupport = true; + boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; } diff --git a/nixops/zeus-hardware-configuration.nix b/nixops/zeus-hardware-configuration.nix index bea50698..27419aa5 100644 --- a/nixops/zeus-hardware-configuration.nix +++ b/nixops/zeus-hardware-configuration.nix @@ -25,8 +25,6 @@ nix.maxJobs = lib.mkDefault 16; powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; - boot.loader.grub.enable = true; - boot.loader.grub.device = "nodev"; - boot.loader.grub.efiSupport = true; + boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = true; }