about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2020-04-01 02:23:21 -0400
committerGitHub <noreply@github.com>2020-04-01 02:23:21 -0400
commit252ca376fa7903f60b31498f8a41437daf7d9946 (patch)
treece20e7ab887c726b61d6b9f5866bdd4830a5d47f /nixos
parent2ca5abd62d202aa8a57c6ba593a94227c24a90f4 (diff)
parent3ad74e3997cbd4c5d74ca7d5a2b809d5588e551a (diff)
downloadnixlib-252ca376fa7903f60b31498f8a41437daf7d9946.tar
nixlib-252ca376fa7903f60b31498f8a41437daf7d9946.tar.gz
nixlib-252ca376fa7903f60b31498f8a41437daf7d9946.tar.bz2
nixlib-252ca376fa7903f60b31498f8a41437daf7d9946.tar.lz
nixlib-252ca376fa7903f60b31498f8a41437daf7d9946.tar.xz
nixlib-252ca376fa7903f60b31498f8a41437daf7d9946.tar.zst
nixlib-252ca376fa7903f60b31498f8a41437daf7d9946.zip
Merge pull request #83717 from worldofpeace/drop-pulseaudio-cruft-display-manager
nixos/display-managers: don't start pulseaudio
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/services/x11/display-managers/default.nix8
1 files changed, 0 insertions, 8 deletions
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 428ca191fd8f..2a7a19e7695a 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -54,14 +54,6 @@ let
         exec &> >(tee ~/.xsession-errors)
       ''}
 
-      # Start PulseAudio if enabled.
-      ${optionalString (config.hardware.pulseaudio.enable) ''
-        # Publish access credentials in the root window.
-        if ${config.hardware.pulseaudio.package.out}/bin/pulseaudio --dump-modules | grep module-x11-publish &> /dev/null; then
-          ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY"
-        fi
-      ''}
-
       # Tell systemd about our $DISPLAY and $XAUTHORITY.
       # This is needed by the ssh-agent unit.
       #