make new layout actually work on galvatron and hopefully starscream

This commit is contained in:
mir 2024-03-07 11:34:30 -09:00
parent 063cb5d99c
commit 2f9aeae491

View File

@ -30,11 +30,9 @@
galvatron = galvatron =
let let
system = "aarch64-linux"; system = "aarch64-linux";
# specialArgs = { inherit nixpkgs-unstable; };
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
./configuration.nix { ./configuration.nix {
# nixpkgs.overlays = [ inputs.apple-silicon.overlays.apple-silicon-overlay ];
hardware.asahi = { hardware.asahi = {
peripheralFirmwareDirectory = ./galvatron/firmware; peripheralFirmwareDirectory = ./galvatron/firmware;
# useExperimentalGPUDriver = true; # useExperimentalGPUDriver = true;
@ -52,6 +50,7 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix; home-manager.users.mir = import ./home.nix;
home-manager.extraSpecialArgs = specialArgs;
} }
]; # end of modules ]; # end of modules
in in
@ -72,7 +71,7 @@
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix; home-manager.users.mir = import ./home.nix;
# Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix home-manager.extraSpecialArgs = specialArgs;
} }
]; # end of modules ]; # end of modules
in in
@ -83,8 +82,8 @@
specialArgs = { inherit inputs; }; specialArgs = { inherit inputs; };
modules = [ modules = [
./configuration.nix { ./configuration.nix {
networking.hostName = "knockout";
boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.canTouchEfiVariables = true;
networking.hostName = "knockout";
sound.enable = true; sound.enable = true;
} }
./hardware/knockout-hw.nix ./hardware/knockout-hw.nix
@ -94,7 +93,6 @@
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users.mir = import ./home.nix; home-manager.users.mir = import ./home.nix;
home-manager.extraSpecialArgs = specialArgs; home-manager.extraSpecialArgs = specialArgs;
# Optionally, use home-manager.extraSpecialArgs to pass arguments to home.nix
} }
]; # end of modules ]; # end of modules
in in