diff options
| author | jeschli <jeschli@gmail.com> | 2018-02-18 10:48:18 +0100 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-02-18 10:48:18 +0100 |
| commit | 52b846c98b21f19c2a138361191439c487fc87cc (patch) | |
| tree | c5182446981dd14df8da4060148980af9e27f08a /lass/3modules/xserver | |
| parent | 94c59247d13622b0293be54cdb5893526434f5d1 (diff) | |
| parent | 13e289a69d1c901e6f1a044ce8973433e9e43880 (diff) | |
Merge branch 'master' of prism.r:stockholm into staging/jeschli
Diffstat (limited to 'lass/3modules/xserver')
| -rw-r--r-- | lass/3modules/xserver/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
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 = '' |