Merge pull request #30467 from adisbladis/display-managers-session/sessionvars

display-managers: Import DBUS session bus address & Xauthority
This commit is contained in:
Jörg Thalheim 2017-10-17 11:32:26 +01:00 committed by GitHub
commit 9aa6337c3d

View File

@ -92,9 +92,12 @@ let
${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY" ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY"
''} ''}
# Tell systemd about our $DISPLAY. This is needed by the # Tell systemd about our $DISPLAY and $XAUTHORITY.
# ssh-agent unit. # This is needed by the ssh-agent unit.
${config.systemd.package}/bin/systemctl --user import-environment DISPLAY #
# Also tell systemd about the dbus session bus address.
# This is required by user units using the session bus.
${config.systemd.package}/bin/systemctl --user import-environment DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS
# Load X defaults. # Load X defaults.
${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft} ${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft}