summaryrefslogtreecommitdiffstats
path: root/jeschli/2configs/xserver/default.nix
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
commit550faa1f64434951cd3949bc96a25012349f0090 (patch)
treeccb7b53686e5de27c780bf8e78866d2eab256a77 /jeschli/2configs/xserver/default.nix
parenta56a2ef0083653a0c0d5c6339857878521958b5d (diff)
parent33e85b86d86e535200651b61406535feec4bad5f (diff)
Merge remote-tracking branch 'enklave/master'
Diffstat (limited to 'jeschli/2configs/xserver/default.nix')
-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 ec3977c7..44c35ca3 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
'';