diff options
| author | makefu <github@syntax-fehler.de> | 2016-05-24 22:27:21 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2016-05-24 22:27:21 +0200 |
| commit | c1971f5aa04553c022fac4d7df7221aef66826a2 (patch) | |
| tree | b13db787aea2c4380b1308112d542eb1b7a4bc9d /lass/2configs/xserver | |
| parent | 9cba0ffefa95079168f3419cf11eb98400a468db (diff) | |
| parent | facb65bd22226742b1805138b2841b29c4c26012 (diff) | |
Merge remote-tracking branch 'cloudkrebs/master'
Diffstat (limited to 'lass/2configs/xserver')
| -rw-r--r-- | lass/2configs/xserver/default.nix | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix index 30afd787e..80c947a7b 100644 --- a/lass/2configs/xserver/default.nix +++ b/lass/2configs/xserver/default.nix @@ -40,8 +40,8 @@ let }; }; - security.setuidPrograms = [ - "slock" + krebs.per-user.lass.packages = [ + pkgs.rxvt_unicode_with-plugins ]; systemd.services.display-manager.enable = false; @@ -52,7 +52,7 @@ let wantedBy = [ "multi-user.target" ]; requires = [ "xserver.service" ]; environment = xmonad-environment; - restartIfChanged = false; + restartIfChanged = true; serviceConfig = { ExecStart = "${xmonad-start}/bin/xmonad"; ExecStop = "${xmonad-stop}/bin/xmonad-stop"; @@ -82,12 +82,7 @@ let # XXX JSON is close enough :) XMONAD_WORKSPACES0_FILE = pkgs.writeText "xmonad.workspaces0" (toJSON [ - "cr" - "gm" - "ff" - "IM" - "mail" - "stockholm" + "dashboard" ]); }; @@ -96,6 +91,9 @@ let set -efu export PATH; PATH=${makeSearchPath "bin" ([ pkgs.rxvt_unicode + pkgs.i3lock + pkgs.pulseaudioLight + pkgs.xorg.xbacklight ] ++ config.environment.systemPackages)}:/var/setuid-wrappers settle() {( # Use PATH for a clean journal @@ -114,7 +112,8 @@ let xmonad-stop = pkgs.writeScriptBin "xmonad-stop" '' #! /bin/sh - exec ${pkgs.xmonad-lass}/bin/xmonad --shutdown + ${pkgs.xmonad-lass}/bin/xmonad --shutdown + ${pkgs.coreutils}/bin/sleep 2s ''; xserver-environment = { @@ -128,7 +127,7 @@ let xserver = pkgs.writeScriptBin "xserver" '' #! /bin/sh set -efu - exec ${pkgs.xorg.xorgserver}/bin/X \ + exec ${pkgs.xorg.xorgserver.out}/bin/X \ :${toString config.services.xserver.display} \ vt${toString config.services.xserver.tty} \ -config ${import ./xserver.conf.nix args} \ |