diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-03 21:54:40 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-03 21:54:40 +0200 |
| commit | 92124ed660c033aa3caa467876f7bc1c6f514d77 (patch) | |
| tree | eaaac3b33ba341b7068ac11e536d56bb647c6480 /nixos/modules/services/x11/display-managers/default.nix | |
| parent | ac46ffbcfce03ad9b35c261301c008e9cf2bdb9b (diff) | |
| parent | 3420bd63b9bbd4eb4e544b898a072c6fbbc9cfa9 (diff) | |
| download | nixlib-92124ed660c033aa3caa467876f7bc1c6f514d77.tar nixlib-92124ed660c033aa3caa467876f7bc1c6f514d77.tar.gz nixlib-92124ed660c033aa3caa467876f7bc1c6f514d77.tar.bz2 nixlib-92124ed660c033aa3caa467876f7bc1c6f514d77.tar.lz nixlib-92124ed660c033aa3caa467876f7bc1c6f514d77.tar.xz nixlib-92124ed660c033aa3caa467876f7bc1c6f514d77.tar.zst nixlib-92124ed660c033aa3caa467876f7bc1c6f514d77.zip | |
Merge master into staging-next
Diffstat (limited to 'nixos/modules/services/x11/display-managers/default.nix')
| -rw-r--r-- | nixos/modules/services/x11/display-managers/default.nix | 8 |
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. # |