From b55f21ebe8960b1abe8d4cc98bac91cdb55a2040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leonardo=20Eug=C3=AAnio?= <lelgenio@disroot.org>
Date: Wed, 21 Dec 2022 23:19:36 -0300
Subject: [PATCH] Set efi system partition

---
 hosts/i15.nix      | 1 +
 hosts/monolith.nix | 1 +
 hosts/pixie.nix    | 1 +
 hosts/rainbow.nix  | 1 +
 system/boot.nix    | 2 --
 5 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/hosts/i15.nix b/hosts/i15.nix
index ebde315..4de6843 100644
--- a/hosts/i15.nix
+++ b/hosts/i15.nix
@@ -20,6 +20,7 @@ in {
     };
   };
 
+  boot.loader.efi.efiSysMountPoint = "/boot/efi";
   fileSystems."/boot/efi" = {
     device = "/dev/disk/by-label/NIX_BOOT";
     fsType = "vfat";
diff --git a/hosts/monolith.nix b/hosts/monolith.nix
index e6485b5..92f54b4 100644
--- a/hosts/monolith.nix
+++ b/hosts/monolith.nix
@@ -42,6 +42,7 @@ in {
       device = "/dev/disk/by-label/CRYPT_DATA";
     };
   };
+  boot.loader.efi.efiSysMountPoint = "/boot/efi";
   fileSystems."/boot/efi" = {
     device = "/dev/disk/by-label/NIXBOOT";
     fsType = "vfat";
diff --git a/hosts/pixie.nix b/hosts/pixie.nix
index 776bcb4..5f8ce66 100644
--- a/hosts/pixie.nix
+++ b/hosts/pixie.nix
@@ -27,6 +27,7 @@
     options = [ "subvol=home" ];
   };
 
+  boot.loader.efi.efiSysMountPoint = "/boot/efi";
   fileSystems."/boot/efi" = {
     device = "/dev/disk/by-uuid/B1BB-15DD";
     fsType = "vfat";
diff --git a/hosts/rainbow.nix b/hosts/rainbow.nix
index 9490fb2..be458c0 100644
--- a/hosts/rainbow.nix
+++ b/hosts/rainbow.nix
@@ -33,6 +33,7 @@ in {
     options = [ "subvol=@home" ] ++ btrfs_options ++ btrfs_ssd;
   };
 
+  boot.loader.efi.efiSysMountPoint = "/boot/efi";
   fileSystems."/boot/efi" = {
     device = "/dev/disk/by-uuid/DC3B-5753";
     fsType = "vfat";
diff --git a/system/boot.nix b/system/boot.nix
index 8a588a0..ddf3560 100644
--- a/system/boot.nix
+++ b/system/boot.nix
@@ -23,8 +23,6 @@
       # It's still possible to open the bootloader list by pressing any key
       # It will just not appear on screen unless a key is pressed
       timeout = 0;
-      efi.canTouchEfiVariables = true;
-      efi.efiSysMountPoint = "/boot/efi";
       systemd-boot = {
         enable = true;
         # editor = false;