spotlight/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

spotlights-macbook: Export i686-linux grub2

Browse source
This commit is contained in:
Spotlight 2025-06-18 19:41:45 -05:00
parent c46dc8329b
commit beeda6aa5f
Signed by: spotlight
GPG key ID: 874AA355B3209BDC
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake.lock generated
View file

@ -92,11 +92,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750263149, "lastModified": 1750275572,
"narHash": "sha256-VYSGDzq4ds4LIYvyEYG+RBqGMGBZhES2tvnmU4TJBn0=", "narHash": "sha256-upC/GIlsIgtdtWRGd1obzdXWYQptNkfzZeyAFWgsgf0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "85e68c6a388ef1dfc799aaa01f00758c58e87d89", "rev": "0f355844e54e4c70906b1ef5cc35a0047d666c04",
"type": "github" "type": "github"
}, },
"original": { "original": {

12
flake.nix
View file

@ -90,13 +90,17 @@
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
}); });
# On aarch64-linux, additionally re-export Asahi-related packages. # Re-export various packages that we use (e.g. Asahi, i686).
# This allows it to be cached via Garnix if necessary, saving local build time. # This allows them to be cached via Garnix if necessary, saving local build time.
asahiPackages = { inputPackages = {
aarch64-linux = { aarch64-linux = {
linux-asahi-kernel = inputs.apple-silicon-support.packages.aarch64-linux.linux-asahi.kernel; linux-asahi-kernel = inputs.apple-silicon-support.packages.aarch64-linux.linux-asahi.kernel;
m1n1 = inputs.apple-silicon-support.packages.aarch64-linux.m1n1; 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. # 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. # and either packages or the home-manager configuration end up being replaced.
# This is not ideal :( # This is not ideal :(
recursiveUpdate = nixpkgs.lib.recursiveUpdate; recursiveUpdate = nixpkgs.lib.recursiveUpdate;
exportedPackages = recursiveUpdate overlayPackages asahiPackages; exportedPackages = recursiveUpdate overlayPackages inputPackages;
in in
recursiveUpdate linuxHomeManager exportedPackages; recursiveUpdate linuxHomeManager exportedPackages;