mirror of
https://github.com/ryan4yin/nix-config.git
synced 2026-04-23 17:28:33 +02:00
fix: nixos-installer - peripheralFirmwareDirectory
This commit is contained in:
18
flake.lock
generated
18
flake.lock
generated
@@ -505,6 +505,23 @@
|
|||||||
"type": "github"
|
"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": {
|
"mysecrets": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@@ -899,6 +916,7 @@
|
|||||||
"haumea": "haumea",
|
"haumea": "haumea",
|
||||||
"home-manager": "home-manager_2",
|
"home-manager": "home-manager_2",
|
||||||
"lanzaboote": "lanzaboote",
|
"lanzaboote": "lanzaboote",
|
||||||
|
"my-asahi-firmware": "my-asahi-firmware",
|
||||||
"mysecrets": "mysecrets",
|
"mysecrets": "mysecrets",
|
||||||
"nix-darwin": "nix-darwin",
|
"nix-darwin": "nix-darwin",
|
||||||
"nix-gaming": "nix-gaming",
|
"nix-gaming": "nix-gaming",
|
||||||
|
|||||||
@@ -158,6 +158,11 @@
|
|||||||
flake = false;
|
flake = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
my-asahi-firmware = {
|
||||||
|
url = "git+ssh://git@github.com/ryan4yin/asahi-firmware.git?shallow=1";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
|
|
||||||
# my wallpapers
|
# my wallpapers
|
||||||
wallpapers = {
|
wallpapers = {
|
||||||
url = "github:ryan4yin/wallpapers";
|
url = "github:ryan4yin/wallpapers";
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{nixos-apple-silicon, ...}:
|
{...}:
|
||||||
#############################################################
|
#############################################################
|
||||||
#
|
#
|
||||||
# Shoukei - NixOS running on Macbook Pro 2022 M2 16G
|
# Shoukei - NixOS running on Macbook Pro 2022 M2 16G
|
||||||
@@ -8,8 +8,6 @@ let
|
|||||||
hostName = "shoukei"; # Define your hostname.
|
hostName = "shoukei"; # Define your hostname.
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
nixos-apple-silicon.nixosModules.default
|
|
||||||
|
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
../idols-ai/preservation.nix
|
../idols-ai/preservation.nix
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -6,14 +6,20 @@
|
|||||||
lib,
|
lib,
|
||||||
pkgs,
|
pkgs,
|
||||||
modulesPath,
|
modulesPath,
|
||||||
|
nixos-apple-silicon,
|
||||||
|
my-asahi-firmware,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
device = "/dev/disk/by-uuid/c2e8b249-240e-4eef-bf4e-81e7dbbf4887";
|
device = "/dev/disk/by-uuid/c2e8b249-240e-4eef-bf4e-81e7dbbf4887";
|
||||||
in {
|
in {
|
||||||
imports = [
|
imports = [
|
||||||
(modulesPath + "/installer/scan/not-detected.nix")
|
(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 = {
|
networking.wireless.iwd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings.General.EnableNetworkConfiguration = true;
|
settings.General.EnableNetworkConfiguration = true;
|
||||||
|
|||||||
@@ -10,11 +10,17 @@
|
|||||||
url = "github:nix-community/nixos-apple-silicon/release-2025-05-30";
|
url = "github:nix-community/nixos-apple-silicon/release-2025-05-30";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
my-asahi-firmware = {
|
||||||
|
url = "git+ssh://git@github.com/ryan4yin/asahi-firmware.git?shallow=1";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs @ {
|
outputs = inputs @ {
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
nixos-apple-silicon,
|
nixos-apple-silicon,
|
||||||
|
my-asahi-firmware,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (inputs.nixpkgs) lib;
|
inherit (inputs.nixpkgs) lib;
|
||||||
@@ -50,7 +56,7 @@
|
|||||||
specialArgs =
|
specialArgs =
|
||||||
inputs
|
inputs
|
||||||
// {
|
// {
|
||||||
inherit mylib myvars;
|
inherit mylib myvars my-asahi-firmware;
|
||||||
};
|
};
|
||||||
modules = [
|
modules = [
|
||||||
{networking.hostName = "shoukei";}
|
{networking.hostName = "shoukei";}
|
||||||
|
|||||||
Reference in New Issue
Block a user