unify screen locking

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

diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs
index 69e3da8bd51fdf08498d7ec06ee7004271b04723..bdee75d1a9d31e8498a52386890b47e5796c07a0 100644 (file)
--- a/xmonad/xmonad.hs
+++ b/xmonad/xmonad.hs
@@ -20,12 +20,9 @@ import XMonad hiding ( (|||) )
 import XMonad.Actions.CycleWS (toggleWS)
 import XMonad.Hooks.ManageHelpers ((-?>), composeOne)
 import XMonad.Hooks.SetWMName (setWMName)
-import XMonad.Layout.IM (withIM, Property(..))
 import XMonad.Layout.LayoutCombinators ((|||), JumpToLayout(..))
 import XMonad.Layout.Named (named)
 import XMonad.Layout.NoBorders (smartBorders)
-import XMonad.Layout.PerWorkspace (onWorkspace)
-import XMonad.Layout.Reflect (reflectHoriz)
 import XMonad.Layout.TwoPane (TwoPane(..))
 import XMonad.Util.EZConfig (additionalKeys)
 import qualified XMonad.StackSet as W
@@ -39,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.
 --
@@ -66,13 +63,11 @@ avoidMaster = W.modify' $ \c -> case c of
 -- (http://nathanhowell.net/2009/03/08/xmonad-and-the-gimp/) for this layout
 -- (read on 2011-06-19).
 myLayoutHook =
-    onWorkspace "5" gimp
-    $ (
-        named "Default" (smartBorders $ Mirror tiled)
+    named "Default" (smartBorders $ Mirror tiled)
         ||| named "Full" (smartBorders Full)
         ||| named "Vertical" (smartBorders tiled)
         ||| named "Limit" (smartBorders $ Mirror $ TwoPane delta ratio)
-    ) where
+  where
     -- Default tiling algorithm partitions the screen into two panes.
     tiled   = Tall nmaster delta ratio
     -- The default number of windows in the master pane.
@@ -81,13 +76,6 @@ myLayoutHook =
     delta   = 3/100
     -- Default proportion of screen occupied by master pane.
     ratio   = 1/2
-    -- Special layout for Gimp: toolbox left, dock right, main window in the
-    -- center.
-    gimp    = withIM (0.11) (Role "gimp-toolbox") $
-              reflectHoriz $
-              withIM (0.15) (Role "gimp-dock")
-              -- Layouts for the centered window.
-              (Mirror tiled ||| Full)
 
 -- Don't spawn new windows in the master pane (which is at the top of the
 -- screen). Thanks to dschoepe, aavogt and especially vav in #xmonad on
@@ -163,11 +151,10 @@ myKeys = [
 
         -- Switch to last active workspace, thanks to moljac024 in #xmonad on
         -- Freenode (2010-12-18 14:45 CET).
-      , ((myModMask, xK_f), toggleWS)
+      , ((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