diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2017-10-17 11:32:26 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-17 11:32:26 +0100 |
commit | 9aa6337c3dc8997f66eac8d61b5eb9bec2cb696e (patch) | |
tree | 34f0c3306bb58967e4df29da8a60e0891b67e7c5 /nixos | |
parent | f9090c3332c9eff8fc15c72395b6a4f617fb9fe9 (diff) | |
parent | 40f402cf653db5c9a3c8a704b25f9437e40fc033 (diff) | |
download | nixlib-9aa6337c3dc8997f66eac8d61b5eb9bec2cb696e.tar nixlib-9aa6337c3dc8997f66eac8d61b5eb9bec2cb696e.tar.gz nixlib-9aa6337c3dc8997f66eac8d61b5eb9bec2cb696e.tar.bz2 nixlib-9aa6337c3dc8997f66eac8d61b5eb9bec2cb696e.tar.lz nixlib-9aa6337c3dc8997f66eac8d61b5eb9bec2cb696e.tar.xz nixlib-9aa6337c3dc8997f66eac8d61b5eb9bec2cb696e.tar.zst nixlib-9aa6337c3dc8997f66eac8d61b5eb9bec2cb696e.zip |
Merge pull request #30467 from adisbladis/display-managers-session/sessionvars
display-managers: Import DBUS session bus address & Xauthority
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/services/x11/display-managers/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 58773685ec1f..3fa482fb6722 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -92,9 +92,12 @@ let ${config.hardware.pulseaudio.package.out}/bin/pactl load-module module-x11-publish "display=$DISPLAY" ''} - # Tell systemd about our $DISPLAY. This is needed by the - # ssh-agent unit. - ${config.systemd.package}/bin/systemctl --user import-environment DISPLAY + # Tell systemd about our $DISPLAY and $XAUTHORITY. + # This is needed by the ssh-agent unit. + # + # 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. ${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft} |