Fix bootloader configurations

hosts/frues-pc/default.nix

@@ -10,6 +10,8 @@
 
   hardware.ckb-next.enable = true;
 
+  boot.loader.efi.efiSysMountPoint = "/boot/efi";
+
   boot.initrd.kernelModules = ["amdgpu"];
   services.xserver.videoDrivers = ["amdgpu"];
   hardware.graphics.extraPackages = with pkgs; [

hosts/frues-port/default.nix

@@ -47,6 +47,9 @@
 
   powerManagement.cpuFreqGovernor = "performance";
 
+  boot.loader.efi.canTouchEfiVariables = false; # For the next option
+  boot.loader.grub.efiInstallAsRemovable = true;
+
   boot = {
     kernelModules = ["acpi_call"];
     extraModulePackages = with config.boot.kernelPackages;

modules/core/bootloader.nix

@@ -1,14 +1,15 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   boot.loader = {
-    efi = {
-      canTouchEfiVariables = true;
-      efiSysMountPoint = "/boot/efi";
-    };
     grub = {
       efiSupport = true;
       device = "nodev";
       useOSProber = true;
     };
+    efi.canTouchEfiVariables = lib.mkDefault true;
   };
   boot.kernelPackages = pkgs.linuxPackages_latest;
 }