From 37a819ea7bc559838abc25a630adbb9c89fe07e9 Mon Sep 17 00:00:00 2001 From: joy Date: Sat, 17 Aug 2024 17:06:58 +0200 Subject: [PATCH] grub --- hosts/desktop/default.nix | 16 +++++++++++++--- hosts/laptop/default.nix | 13 +++++++++++-- modules/misc/default.nix | 1 + 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix index abb1ff2..ac39b46 100644 --- a/hosts/desktop/default.nix +++ b/hosts/desktop/default.nix @@ -2,10 +2,20 @@ { networking.hostName = "desktop"; networking.networkmanager.enable = true; + + boot.loader = { + efi = { + canTouchEfiVariables = true; + efiSysMountPoint = "/boot/efi"; # ← use the same mount point here. + }; + grub = { + efiSupport = true; + device = "nodev"; + }; + }; + + services.hardware.openrgb.enable = true; - - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; imports = [ ../../modules diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix index 93a811b..2c831ae 100644 --- a/hosts/laptop/default.nix +++ b/hosts/laptop/default.nix @@ -2,9 +2,18 @@ { networking.hostName = "laptop"; networking.networkmanager.enable = true; + + boot.loader = { + efi = { + canTouchEfiVariables = true; + efiSysMountPoint = "/boot/efi"; # ← use the same mount point here. + }; + grub = { + efiSupport = true; + device = "nodev"; + }; + }; - boot.loader.systemd-boot.enable = true; - boot.loader.efi.canTouchEfiVariables = true; environment.systemPackages = with pkgs; [ prismlauncher diff --git a/modules/misc/default.nix b/modules/misc/default.nix index 4a987aa..f0406f1 100644 --- a/modules/misc/default.nix +++ b/modules/misc/default.nix @@ -25,4 +25,5 @@ services.printing.enable = true; time.timeZone = "Europe/Zurich"; system.stateVersion = "23.11"; + home-manager.backupFileExtension = "backup"; }