summaryrefslogtreecommitdiffstats
path: root/jeschli/2configs/xserver
diff options
context:
space:
mode:
authortv <tv@krebsco.de>2019-04-13 14:07:30 +0200
committertv <tv@krebsco.de>2019-04-13 14:07:30 +0200
commit2207162b0890dd61cc4e8b0b49b573508a090fd9 (patch)
tree40e08e242660f96fb184afeed8608f2b1ca3aff1 /jeschli/2configs/xserver
parentf1169b8e71c61106be4e9bb1d4df7bbd590837fe (diff)
parentf0c85f305f662b96033dbbe896e399e5a58a28dd (diff)
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'jeschli/2configs/xserver')
-rw-r--r--jeschli/2configs/xserver/default.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/jeschli/2configs/xserver/default.nix b/jeschli/2configs/xserver/default.nix
index ec3977c..44c35ca 100644
--- a/jeschli/2configs/xserver/default.nix
+++ b/jeschli/2configs/xserver/default.nix
@@ -51,6 +51,12 @@ in {
${pkgs.xorg.xmodmap}/bin/xmodmap ${import ./Xmodmap.nix args} &
${pkgs.xorg.xrdb}/bin/xrdb ${import ./Xresources.nix args} &
${pkgs.xorg.xsetroot}/bin/xsetroot -solid '#1c1c1c' &
+ ${config.services.xserver.displayManager.sessionCommands}
+ if test -z "$DBUS_SESSION_BUS_ADDRESS"; then
+ exec ${pkgs.dbus.dbus-launch} --exit-with-session "$0" ""
+ fi
+ export DBUS_SESSION_BUS_ADDRESS
+ ${config.systemd.package}/bin/systemctl --user import-environment DISPLAY DBUS_SESSION_BUS_ADDRESS
wait
'';