From dc2b6931ebfb775f715bc1c3837c20463bcb2418 Mon Sep 17 00:00:00 2001
From: lassulus <lassulus@lassul.us>
Date: Tue, 13 Feb 2018 17:35:55 +0100
Subject: l xserver: add DBUS_SESSION

---
 lass/3modules/xserver/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'lass')

diff --git a/lass/3modules/xserver/default.nix b/lass/3modules/xserver/default.nix
index d16f89f45..cdd80857a 100644
--- a/lass/3modules/xserver/default.nix
+++ b/lass/3modules/xserver/default.nix
@@ -33,6 +33,11 @@ let
         XMONAD_STARTUP_HOOK = pkgs.writeDash "xmonad-startup-hook" ''
           ${pkgs.xorg.xhost}/bin/xhost +LOCAL: &
           ${xcfg.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
         '';
 
@@ -74,6 +79,7 @@ let
           "-xkbdir ${pkgs.xkeyboard_config}/etc/X11/xkb"
           (optional (xcfg.dpi != null) "-dpi ${toString xcfg.dpi}")
         ];
+        User = user.name;
       };
     };
     krebs.xresources.resources.dpi = ''
-- 
cgit v1.2.3