diff options
| author | jeschli <jeschli@gmail.com> | 2018-02-28 20:10:42 +0000 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-02-28 20:10:42 +0000 |
| commit | a7e49dd5fc590ba2ccb26d559d672767c87a7692 (patch) | |
| tree | 3d0fb66d17085f1288037da1b4d9987fa402e40e /lass/3modules/xserver/default.nix | |
| parent | 4a2af184e6846f80b139357c6230558cd8785b10 (diff) | |
| parent | 4c0d0f64ed21d3d7292bb5e8900d973e649375c1 (diff) | |
Merge branch 'staging/jeschli' of prism.i:stockholm into staging/jeschli
Diffstat (limited to 'lass/3modules/xserver/default.nix')
| -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 = '' |