From beeda6aa5fd931119f4e0c8950d935ebf19fec2a Mon Sep 17 00:00:00 2001
From: Spotlight <spotlight@joscomputing.space>
Date: Wed, 18 Jun 2025 19:41:45 -0500
Subject: [PATCH] spotlights-macbook: Export i686-linux grub2

---
 flake.lock |  6 +++---
 flake.nix  | 12 ++++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/flake.lock b/flake.lock
index 039365d..3341468 100644
--- a/flake.lock
+++ b/flake.lock
@@ -92,11 +92,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1750263149,
-        "narHash": "sha256-VYSGDzq4ds4LIYvyEYG+RBqGMGBZhES2tvnmU4TJBn0=",
+        "lastModified": 1750275572,
+        "narHash": "sha256-upC/GIlsIgtdtWRGd1obzdXWYQptNkfzZeyAFWgsgf0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "85e68c6a388ef1dfc799aaa01f00758c58e87d89",
+        "rev": "0f355844e54e4c70906b1ef5cc35a0047d666c04",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 70d3108..b46b3c4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -90,13 +90,17 @@
             pkgs = nixpkgs.legacyPackages.${system};
           });
 
-          # On aarch64-linux, additionally re-export Asahi-related packages.
-          # This allows it to be cached via Garnix if necessary, saving local build time.
-          asahiPackages = {
+          # Re-export various packages that we use (e.g. Asahi, i686).
+          # This allows them to be cached via Garnix if necessary, saving local build time.
+          inputPackages = {
             aarch64-linux = {
               linux-asahi-kernel = inputs.apple-silicon-support.packages.aarch64-linux.linux-asahi.kernel;
               m1n1 = inputs.apple-silicon-support.packages.aarch64-linux.m1n1;
             };
+            i686-linux = {
+              grub2 = inputs.nixpkgs.legacyPackages.i686-linux.grub2;
+              grub2_efi = inputs.nixpkgs.legacyPackages.i686-linux.grub2_efi;
+            };
           };
 
           # We must use recursiveUpdate in order to go deeper beyond one level.
@@ -107,7 +111,7 @@
           # and either packages or the home-manager configuration end up being replaced.
           # This is not ideal :(
           recursiveUpdate = nixpkgs.lib.recursiveUpdate;
-          exportedPackages = recursiveUpdate overlayPackages asahiPackages;
+          exportedPackages = recursiveUpdate overlayPackages inputPackages;
         in
         recursiveUpdate linuxHomeManager exportedPackages;