From 2b3d6fb3d7c5a0bb31abdf8bda957e6db7fd24dc Mon Sep 17 00:00:00 2001
From: LavaDesu <me@lava.moe>
Date: Wed, 24 Jul 2024 13:35:59 +1000
Subject: [PATCH] hosts/dandelion: store esp in boot/efi to allow for kernel
 files

---
 hosts/dandelion/filesystem.nix | 2 +-
 hosts/dandelion/kernel.nix     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/hosts/dandelion/filesystem.nix b/hosts/dandelion/filesystem.nix
index d37cb1f..b191949 100644
--- a/hosts/dandelion/filesystem.nix
+++ b/hosts/dandelion/filesystem.nix
@@ -25,7 +25,7 @@ in {
       options = [ "defaults" "size=12G" "mode=755" ];
     };
 
-    "/boot" = mkLabelMount "UEFI" "vfat" true;
+    "/boot/efi" = mkLabelMount "UEFI" "vfat" true;
     "/nix" = submount "/@/nix" false;
     "/persist" = (submount "/@/persist" true) // { neededForBoot = true; };
     "/persist/.snapshots" = submount "/snap/persist" false;
diff --git a/hosts/dandelion/kernel.nix b/hosts/dandelion/kernel.nix
index 76629f3..f6ed9ad 100644
--- a/hosts/dandelion/kernel.nix
+++ b/hosts/dandelion/kernel.nix
@@ -3,8 +3,10 @@
     loader = {
       systemd-boot.enable = false;
       efi.canTouchEfiVariables = true;
+      efi.efiSysMountPoint = "/boot/efi";
       grub = {
         enable = true;
+        efiSupport = true;
         device = "/dev/sda";
       };
     };