summaryrefslogtreecommitdiffstats
path: root/jeschli/2configs/xserver
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2019-03-12 11:19:16 +0100
committerlassulus <lassulus@lassul.us>2019-03-12 11:19:16 +0100
commitdb8d53cefd8f3fae0b48d5a7d175833c8ea408fe (patch)
tree8d49d396a00312873cf0ac721ef24edd8ddc4605 /jeschli/2configs/xserver
parentd8cf96905a7598e52bfd0d52596f5edad7d7cc5f (diff)
parent07915f04077841a1afd253cd474fd71a1cb92bcb (diff)
Merge remote-tracking branch 'enklave/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
'';