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

display-managers: Import DBUS session bus address & Xauthority

authored by Jörg Thalheim and committed by GitHub 9aa6337c f9090c33

+6 -3
+6 -3
nixos/modules/services/x11/display-managers/default.nix
··· 92 ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY" 93 ''} 94 95 - # Tell systemd about our $DISPLAY. This is needed by the 96 - # ssh-agent unit. 97 - ${config.systemd.package}/bin/systemctl --user import-environment DISPLAY 98 99 # Load X defaults. 100 ${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft}
··· 92 ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY" 93 ''} 94 95 + # Tell systemd about our $DISPLAY and $XAUTHORITY. 96 + # This is needed by the ssh-agent unit. 97 + # 98 + # Also tell systemd about the dbus session bus address. 99 + # This is required by user units using the session bus. 100 + ${config.systemd.package}/bin/systemctl --user import-environment DISPLAY XAUTHORITY DBUS_SESSION_BUS_ADDRESS 101 102 # Load X defaults. 103 ${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft}