From 71d724019c5b4ca1f2c5aed1481550739c20e2e1 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 21 Oct 2023 13:05:42 +0300 Subject: [PATCH 1/2] steamdeck/sound: move UCM configs to the right location Moved in alsa-ucm-conf 1.2.9 --- modules/steamdeck/sound.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/steamdeck/sound.nix b/modules/steamdeck/sound.nix index 166968ad..fb48bf2c 100644 --- a/modules/steamdeck/sound.nix +++ b/modules/steamdeck/sound.nix @@ -7,7 +7,8 @@ let cp -r --no-preserve=all ${pkgs.alsa-ucm-conf} $out # override acp5x configs with Jovian stuff - cp -f ${pkgs.jupiter-hw-support}/share/alsa/ucm2/conf.d/acp5x/* $out/share/alsa/ucm2/conf.d/acp5x/ + # NOTE: different location to account for upstream changes in alsa-ucm-conf 1.2.9+ + cp -rf ${pkgs.jupiter-hw-support}/share/alsa/ucm2/conf.d/acp5x/* $out/share/alsa/ucm2/AMD/acp5x/ ''; in { From 2db44ac7f0d00172955bf8848b3f8102c7bbd6ea Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 22 Oct 2023 16:12:14 +0300 Subject: [PATCH 2/2] steamdeck/sound: also add UCM configs to Wireplumber Duh. --- modules/steamdeck/sound.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/steamdeck/sound.nix b/modules/steamdeck/sound.nix index fb48bf2c..c04acb6a 100644 --- a/modules/steamdeck/sound.nix +++ b/modules/steamdeck/sound.nix @@ -60,6 +60,12 @@ in systemd.user.services.pipewire = lib.mkIf (!systemWide) { environment.ALSA_CONFIG_UCM2 = config.environment.variables.ALSA_CONFIG_UCM2; }; + systemd.services.wireplumber = lib.mkIf systemWide { + environment.ALSA_CONFIG_UCM2 = config.environment.variables.ALSA_CONFIG_UCM2; + }; + systemd.user.services.wireplumber = lib.mkIf (!systemWide) { + environment.ALSA_CONFIG_UCM2 = config.environment.variables.ALSA_CONFIG_UCM2; + }; })) ]); }