nixos/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware.git synced 2025-11-09 03:56:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1421 from soopyc/apple-t2/update-option

Browse source 
apple/t2: migrate renamed option
This commit is contained in:
Jörg Thalheim 2025-03-17 13:46:08 +01:00 • committed by GitHub
commit fad7119291
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
apple/t2/default.nix
View file

@ -7,6 +7,8 @@
let let
inherit (lib) types; inherit (lib) types;
nixosVersion = lib.versions.majorMinor lib.version;
audioFiles = pkgs.fetchFromGitHub { audioFiles = pkgs.fetchFromGitHub {
owner = "kekrby"; owner = "kekrby";
repo = "t2-better-audio"; repo = "t2-better-audio";
@ -82,8 +84,6 @@ in
"iommu=pt" "iommu=pt"
]; ];
hardware.pulseaudio.package = overrideAudioFiles pkgs.pulseaudio "src/modules/";
services.pipewire.package = pipewirePackage; services.pipewire.package = pipewirePackage;
services.pipewire.wireplumber.package = pkgs.wireplumber.override { services.pipewire.wireplumber.package = pkgs.wireplumber.override {
pipewire = pipewirePackage; pipewire = pipewirePackage;
@ -92,6 +92,13 @@ in
# Make sure post-resume.service exists # Make sure post-resume.service exists
powerManagement.enable = true; powerManagement.enable = true;
} }
(if lib.versionAtLeast nixosVersion "25.05" then {
services.pulseaudio.package = overrideAudioFiles pkgs.pulseaudio "src/modules/";
} else {
hardware.pulseaudio.package = overrideAudioFiles pkgs.pulseaudio "src/modules/";
})
(lib.mkIf t2Cfg.enableIGPU { (lib.mkIf t2Cfg.enableIGPU {
# Enable the iGPU by default if present # Enable the iGPU by default if present
environment.etc."modprobe.d/apple-gmux.conf".text = '' environment.etc."modprobe.d/apple-gmux.conf".text = ''