From 99b8bfeaec5f3d70148354f128568e15be249b9d Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Mon, 25 Apr 2016 15:25:04 +0200
Subject: l: use i3lock instead of slock

---
 lass/2configs/xserver/default.nix | 5 +----
 lass/5pkgs/xmonad-lass/Main.hs    | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

(limited to 'lass')

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%")
-- 
cgit v1.2.3