pulseaudio: Resolve conflicting asound.conf of pulseaudio and alsa

Fixes issue #25790.

Balletie 44fadbb9 d4f45ae3

Changed files
+5 -1
nixos
modules
config
services
audio
+2
nixos/modules/config/pulseaudio.nix
···
let
cfg = config.hardware.pulseaudio;
+
alsaCfg = config.sound;
systemWide = cfg.enable && cfg.systemWide;
nonSystemWide = cfg.enable && !cfg.systemWide;
···
ctl.!default {
type pulse
}
+
${alsaCfg.extraConfig}
'');
in {
+3 -1
nixos/modules/services/audio/alsa.nix
···
inherit (pkgs) alsaUtils;
+
pulseaudioEnabled = config.hardware.pulseaudio.enable;
+
in
{
···
environment.systemPackages = [ alsaUtils ];
-
environment.etc = mkIf (config.sound.extraConfig != "")
+
environment.etc = mkIf (!pulseaudioEnabled && config.sound.extraConfig != "")
[
{ source = pkgs.writeText "asound.conf" config.sound.extraConfig;
target = "asound.conf";