From 44eb056f49014729fb432aab81b83f7806067d4e Mon Sep 17 00:00:00 2001
From: chn <chn@chn.moe>
Date: Sat, 17 Aug 2024 11:53:01 +0800
Subject: [PATCH] fix grub

---
 devices/pc/default.nix  | 11 +++++------
 flake.lock              |  6 +++---
 modules/system/grub.nix |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/devices/pc/default.nix b/devices/pc/default.nix
index a7ed014c..b20653d5 100644
--- a/devices/pc/default.nix
+++ b/devices/pc/default.nix
@@ -159,18 +159,17 @@ inputs:
       {
         extraFiles =
         {
-          "shell.efi" = "${inputs.pkgs.edk2-uefi-shell}/shell.efi";
-          "efi/DisplayEngine.efi" = ./bios/DisplayEngine.efi;
-          "efi/SetupBrowser.efi" = ./bios/SetupBrowser.efi;
-          "efi/UiApp.efi" = ./bios/UiApp.efi;
-          "efi/Bootx64.efi" = ./bios/Bootx64.efi;
+          "DisplayEngine.efi" = ./bios/DisplayEngine.efi;
+          "SetupBrowser.efi" = ./bios/SetupBrowser.efi;
+          "UiApp.efi" = ./bios/UiApp.efi;
+          "EFI/Boot/Bootx64.efi" = ./bios/Bootx64.efi;
         };
         extraEntries = 
         ''
           menuentry 'Advanced UEFI Firmware Settings' {
             insmod fat
             insmod chain
-            chainloader @bootRoot@/Bootx64.efi
+            chainloader EFI/Boot/Bootx64.efi
           }
         '';
       };
diff --git a/flake.lock b/flake.lock
index 409a3be8..d4dc2fd2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -883,11 +883,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1723695314,
-        "narHash": "sha256-qAjxCaXSRScGjZe24N2k0mVD7RYGvxlR4fjDhyDARa8=",
+        "lastModified": 1723866309,
+        "narHash": "sha256-9FXNU8DgbHNZkF9Ae59KsAkbydUzY269GLTgCLv36QM=",
         "owner": "CHN-beta",
         "repo": "nixpkgs",
-        "rev": "1e3245ea7d7f8661b9efce6b32589daf780fe240",
+        "rev": "372f03471aa2e95b1054d422500357babfe33fb4",
         "type": "github"
       },
       "original": {
diff --git a/modules/system/grub.nix b/modules/system/grub.nix
index 5a177c29..90e44249 100644
--- a/modules/system/grub.nix
+++ b/modules/system/grub.nix
@@ -72,7 +72,7 @@ inputs:
                 menuentry "UEFI Shell" {
                   insmod fat
                   insmod chain
-                  chainloader @bootRoot@/shell.efi
+                  chainloader /shell.efi
                 }
               ''
             )