Merge pull request #12811 from abbradar/pulseaudio-device-manager

Load PulseAudio's module-device-manager only for KDE

+15 -4
+6
nixos/modules/services/x11/desktop-managers/kde4.nix
··· 108 108 sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf 109 109 fi 110 110 111 + # Load PulseAudio module for routing support. 112 + # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/ 113 + ${optionalString config.hardware.pulseaudio.enable '' 114 + ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" 115 + ''} 116 + 111 117 # Start KDE. 112 118 exec ${kde_workspace}/bin/startkde 113 119 '';
+9 -1
nixos/modules/services/x11/desktop-managers/kde5.nix
··· 55 55 services.xserver.desktopManager.session = singleton { 56 56 name = "kde5"; 57 57 bgSupport = true; 58 - start = ''exec ${kde5.plasma-workspace}/bin/startkde;''; 58 + start = '' 59 + # Load PulseAudio module for routing support. 60 + # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/ 61 + ${optionalString config.hardware.pulseaudio.enable '' 62 + ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" 63 + ''} 64 + 65 + exec ${kde5.plasma-workspace}/bin/startkde 66 + ''; 59 67 }; 60 68 61 69 security.setuidOwners = singleton {
-3
nixos/modules/services/x11/display-managers/default.nix
··· 90 90 91 91 # Publish access credentials in the root window. 92 92 ${config.hardware.pulseaudio.package}/bin/pactl load-module module-x11-publish "display=$DISPLAY" 93 - 94 - # Keep track of devices. Mostly useful for Phonon/KDE. 95 - ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1" 96 93 ''} 97 94 98 95 # Tell systemd about our $DISPLAY. This is needed by the