summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lass@aidsballs.de>2016-04-25 15:25:04 +0200
committerlassulus <lass@aidsballs.de>2016-04-25 15:25:04 +0200
commit99b8bfeaec5f3d70148354f128568e15be249b9d (patch)
tree5b12e3e1063af13c41db0a54c1cbd0d6174c9719
parentd4cb24edb28d4662b98a7f1dc4bf4ed8b4e89f23 (diff)
l: use i3lock instead of slock
-rw-r--r--lass/2configs/xserver/default.nix5
-rw-r--r--lass/5pkgs/xmonad-lass/Main.hs2
2 files changed, 2 insertions, 5 deletions
diff --git a/lass/2configs/xserver/default.nix b/lass/2configs/xserver/default.nix
index 30afd787e..fbae9741f 100644
--- a/lass/2configs/xserver/default.nix
+++ b/lass/2configs/xserver/default.nix
@@ -40,10 +40,6 @@ let
};
};
- security.setuidPrograms = [
- "slock"
- ];
-
systemd.services.display-manager.enable = false;
services.xserver.enable = true;
@@ -96,6 +92,7 @@ let
set -efu
export PATH; PATH=${makeSearchPath "bin" ([
pkgs.rxvt_unicode
+ pkgs.i3lock
] ++ config.environment.systemPackages)}:/var/setuid-wrappers
settle() {(
# Use PATH for a clean journal
diff --git a/lass/5pkgs/xmonad-lass/Main.hs b/lass/5pkgs/xmonad-lass/Main.hs
index 503df3be7..4c267359c 100644
--- a/lass/5pkgs/xmonad-lass/Main.hs
+++ b/lass/5pkgs/xmonad-lass/Main.hs
@@ -119,7 +119,7 @@ displaySomeException = displayException
myKeyMap =
- [ ("M4-<F11>", spawn "/var/setuid-wrappers/slock")
+ [ ("M4-<F11>", spawn "i3lock -i /tmp/wallpaper.png -f")
, ("M4-p", spawn "passmenu --type")
--, ("M4-r", spawn "exe=$(yeganesh -x) && eval \"exec $exe\"")
, ("<XF86AudioRaiseVolume>", spawn "pactl -- set-sink-volume 0 +4%")