summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2019-02-05 19:20:17 +0100
committerjeschli <jeschli@gmail.com>2019-02-09 15:52:32 +0100
commit4db5777d9a9d0aefcac61612a950e7c648f2ef84 (patch)
treeebb8aef3259ca33d119a232b04825e8a15d3df1c
parentd9f9d2d0d6c356568b6f92c10bc959206e78fc87 (diff)
j xserver: add dbus magic for xserver (xserver/default.nix not working currently)
-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 ec3977c7e..44c35ca37 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
'';