fix: nixos-installer - peripheralFirmwareDirectory

This commit is contained in:
Ryan Yin
2025-07-13 00:14:03 +08:00
parent c55b1c6712
commit 9dcafa8cc9
5 changed files with 37 additions and 4 deletions

18
flake.lock generated
View File

@@ -505,6 +505,23 @@
"type": "github"
}
},
"my-asahi-firmware": {
"flake": false,
"locked": {
"lastModified": 1752336609,
"narHash": "sha256-PeJXDQgKwmu6PEjEA+68I7nIOTTpwUUyO1b5PpQg4gc=",
"ref": "refs/heads/main",
"rev": "981583c8e101967ef6a66388ade54cab751f3a02",
"shallow": true,
"type": "git",
"url": "ssh://git@github.com/ryan4yin/asahi-firmware.git"
},
"original": {
"shallow": true,
"type": "git",
"url": "ssh://git@github.com/ryan4yin/asahi-firmware.git"
}
},
"mysecrets": {
"flake": false,
"locked": {
@@ -899,6 +916,7 @@
"haumea": "haumea",
"home-manager": "home-manager_2",
"lanzaboote": "lanzaboote",
"my-asahi-firmware": "my-asahi-firmware",
"mysecrets": "mysecrets",
"nix-darwin": "nix-darwin",
"nix-gaming": "nix-gaming",

View File

@@ -158,6 +158,11 @@
flake = false;
};
my-asahi-firmware = {
url = "git+ssh://git@github.com/ryan4yin/asahi-firmware.git?shallow=1";
flake = false;
};
# my wallpapers
wallpapers = {
url = "github:ryan4yin/wallpapers";

View File

@@ -1,4 +1,4 @@
{nixos-apple-silicon, ...}:
{...}:
#############################################################
#
# Shoukei - NixOS running on Macbook Pro 2022 M2 16G
@@ -8,8 +8,6 @@ let
hostName = "shoukei"; # Define your hostname.
in {
imports = [
nixos-apple-silicon.nixosModules.default
./hardware-configuration.nix
../idols-ai/preservation.nix
];

View File

@@ -6,14 +6,20 @@
lib,
pkgs,
modulesPath,
nixos-apple-silicon,
my-asahi-firmware,
...
}: let
device = "/dev/disk/by-uuid/c2e8b249-240e-4eef-bf4e-81e7dbbf4887";
in {
imports = [
(modulesPath + "/installer/scan/not-detected.nix")
nixos-apple-silicon.nixosModules.default
];
# Specify path to peripheral firmware files.
hardware.asahi.peripheralFirmwareDirectory = "${my-asahi-firmware}/macbook-pro-m2-a2338";
networking.wireless.iwd = {
enable = true;
settings.General.EnableNetworkConfiguration = true;

View File

@@ -10,11 +10,17 @@
url = "github:nix-community/nixos-apple-silicon/release-2025-05-30";
inputs.nixpkgs.follows = "nixpkgs";
};
my-asahi-firmware = {
url = "git+ssh://git@github.com/ryan4yin/asahi-firmware.git?shallow=1";
flake = false;
};
};
outputs = inputs @ {
nixpkgs,
nixos-apple-silicon,
my-asahi-firmware,
...
}: let
inherit (inputs.nixpkgs) lib;
@@ -50,7 +56,7 @@
specialArgs =
inputs
// {
inherit mylib myvars;
inherit mylib myvars my-asahi-firmware;
};
modules = [
{networking.hostName = "shoukei";}