From 08d7136a2e3150dd898cf2d2d3756801dfb407bd Mon Sep 17 00:00:00 2001 From: sefidel Date: Wed, 15 Feb 2023 14:32:53 +0900 Subject: feat(nixos/kompakt): use flakes for asahi-related dependencies Imports are done directly inside the system configuration file to ensure one doesn't forget to import the required modules. --- nixos/kompakt/asahi_firmware/all_firmware.tar.gz | Bin 14086530 -> 0 bytes .../asahi_firmware/kernelcache.release.mac13g | Bin 24460734 -> 0 bytes nixos/kompakt/configuration.nix | 11 ++++++++--- 3 files changed, 8 insertions(+), 3 deletions(-) delete mode 100755 nixos/kompakt/asahi_firmware/all_firmware.tar.gz delete mode 100755 nixos/kompakt/asahi_firmware/kernelcache.release.mac13g (limited to 'nixos/kompakt') diff --git a/nixos/kompakt/asahi_firmware/all_firmware.tar.gz b/nixos/kompakt/asahi_firmware/all_firmware.tar.gz deleted file mode 100755 index 974fca8..0000000 Binary files a/nixos/kompakt/asahi_firmware/all_firmware.tar.gz and /dev/null differ diff --git a/nixos/kompakt/asahi_firmware/kernelcache.release.mac13g b/nixos/kompakt/asahi_firmware/kernelcache.release.mac13g deleted file mode 100755 index db5e091..0000000 Binary files a/nixos/kompakt/asahi_firmware/kernelcache.release.mac13g and /dev/null differ diff --git a/nixos/kompakt/configuration.nix b/nixos/kompakt/configuration.nix index bc033f7..716ceb5 100644 --- a/nixos/kompakt/configuration.nix +++ b/nixos/kompakt/configuration.nix @@ -1,21 +1,26 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, apple-silicon, asahi-firmware, ... }: { imports = [ ./hardware-configuration.nix - ../modules/apple-silicon-support + apple-silicon.nixosModules.apple-silicon-support ]; + nixpkgs.overlays = [ apple-silicon.overlays.apple-silicon-overlay ]; + boot.loader.systemd-boot.enable = true; boot.loader.efi.canTouchEfiVariables = false; # Specify path to peripheral firmware files. # This lets the flake stay pure. - hardware.asahi.peripheralFirmwareDirectory = ./asahi_firmware; + hardware.asahi.peripheralFirmwareDirectory = asahi-firmware; # Or completely disable extraction and managemement of them completely: # hardware.asahi.extractPeripheralFirmware = false; + # Enable GPU acceleration + hardware.asahi.useExperimentalGPUDriver = true; + boot.kernelParams = [ "console=tty1" ]; -- cgit 1.4.1