diff options
| author | nin <nin@c-base.org> | 2018-02-27 22:30:49 +0100 |
|---|---|---|
| committer | nin <nin@c-base.org> | 2018-02-27 22:30:49 +0100 |
| commit | 01289f333143fa145fe585812d05672efd3f3ebe (patch) | |
| tree | d6de52e9914cd6489cbad61ae7c6fb60ad472c41 /lass/3modules | |
| parent | f20bf1a7ba146b3ffe3f2e470614d12885cbce61 (diff) | |
| parent | 9e67031cb878c0bcdcde39a7b7b746111de6719a (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/3modules')
| -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 = '' |