lenn/nixos-hardware
1
0
Fork 0
mirror of https://github.com/NixOS/nixos-hardware.git synced 2025-11-05 01:37:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

apple/t2: migrate renamed option

Browse Source
This commit is contained in:
Cassie Cheung
2025-03-17 15:04:44 +08:00
parent 113cd39166
commit 05fa89d1c5
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 = ''