diff options
| author | jeschli <jeschli@gmail.com> | 2018-03-20 15:37:44 +0100 |
|---|---|---|
| committer | jeschli <jeschli@gmail.com> | 2018-03-20 15:37:44 +0100 |
| commit | 01358d3947b46c2d9cceb7f6c53855cb536d6efe (patch) | |
| tree | 194c3c5e346327774603f8948a0fa301a082be90 /lass/3modules | |
| parent | 390375cd8a0c745eb6b4df93f3f6f3e5f2985c90 (diff) | |
| parent | 6267aa42509a4f56dc95dfc2db7773c33ca12522 (diff) | |
Merge branch 'staging/jeschli' of prism.r:stockholm into staging/jeschli
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 = '' |