unify screen locking

[config/dotfiles.git] / xmonad / xmonad.hs

diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs
index 94221468fef841ec32184b9b211ed7030ac3b499..bdee75d1a9d31e8498a52386890b47e5796c07a0 100644 (file)
--- a/xmonad/xmonad.hs
+++ b/xmonad/xmonad.hs
@@ -36,7 +36,7 @@ import qualified XMonad.StackSet as W
 avoidMaster :: W.StackSet i l a s sd -> W.StackSet i l a s sd
 avoidMaster = W.modify' $ \c -> case c of
     W.Stack t [] (r:rs) -> W.Stack r [] (t:rs)
-    otherwise           -> c
+    _                   -> c
 
 -- Create my custom layout.
 --
@@ -153,9 +153,8 @@ myKeys = [
         -- Freenode (2010-12-18 14:45 CET).
       , ((myModMask, xK_b), toggleWS)
 
-      -- Lock the screen. The sleep is necessary to allow xtrlock to grab the
-      -- keyboard input.
-      , ((myModMask, xK_z), spawn "sleep 1 && exec xtrlock")
+      -- Lock the screen.
+      , ((myModMask, xK_z), spawn "$HOME/.xlockscreen lock")
     ]
     ++
     -- When using multiple screens, switching to another workspace causes