X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xmonad%2Fxmonad.hs;h=aed53efd0f90bbfbe1f43f21f86194043fc275d2;hb=ec5446ed1518e34d75867502295a026cbf16ac39;hp=f8e7ca157ced90896ba2765bdbd08f3e4bd0a358;hpb=6b37d22a4efca8766370822e6cb2fad9f92684b1;p=config%2Fdotfiles.git

diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs
index f8e7ca1..aed53ef 100644
--- a/xmonad/xmonad.hs
+++ b/xmonad/xmonad.hs
@@ -1,8 +1,6 @@
 -- xmonad configuration file.
---
--- Tested with xmonad 0.9, most settings should work fine with xmonad 0.7.
 
--- Copyright (C) 2011-2012  Simon Ruderich
+-- Copyright (C) 2011-2015  Simon Ruderich
 --
 -- This file is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU General Public License as published by
@@ -18,33 +16,19 @@
 -- along with this file.  If not, see <http://www.gnu.org/licenses/>.
 
 
--- "hiding" necessary for LayoutCombinators.
 import XMonad hiding ( (|||) )
--- Necessary for reflectVert.
-import XMonad.Layout.Reflect
--- Necessary for avoidMaster.
+import XMonad.Layout.Reflect (reflectHoriz)
 import qualified XMonad.StackSet as W
--- Necessary for toggleLayouts.
-import XMonad.Layout.ToggleLayouts
--- Necessary for smartBorders.
-import XMonad.Layout.NoBorders
--- Necessary for composeOne and -?>.
-import XMonad.Hooks.ManageHelpers
--- Necessary for `additionalKeys`.
-import XMonad.Util.EZConfig
--- Necessary for setWMName.
-import XMonad.Hooks.SetWMName
--- Necessary for toggleWS.
-import XMonad.Actions.CycleWS
--- Necessary for named.
-import XMonad.Layout.Named
--- Necessary for JumpToLayout.
-import XMonad.Layout.LayoutCombinators
--- Necessary for Limit layout.
-import XMonad.Layout.TwoPane
--- Necessary for the Gimp layout.
-import XMonad.Layout.PerWorkspace
-import XMonad.Layout.IM
+import XMonad.Layout.NoBorders (smartBorders)
+import XMonad.Hooks.ManageHelpers ((-?>), composeOne)
+import XMonad.Util.EZConfig (additionalKeys)
+import XMonad.Hooks.SetWMName (setWMName)
+import XMonad.Actions.CycleWS (toggleWS)
+import XMonad.Layout.Named (named)
+import XMonad.Layout.LayoutCombinators ((|||), JumpToLayout(..))
+import XMonad.Layout.TwoPane (TwoPane(..))
+import XMonad.Layout.PerWorkspace (onWorkspace)
+import XMonad.Layout.IM (withIM, Property(..))
 
 
 -- Prevent new windows from spawning in the master pane. Taken from
@@ -177,9 +161,9 @@ myKeys = [
         -- Freenode (2010-12-18 14:45 CET).
       , ((myModMask, xK_f), toggleWS)
 
-      -- Lock the screen. The sleep is necessary to allow xtrlock to graph the
+      -- Lock the screen. The sleep is necessary to allow xtrlock to grab the
       -- keyboard input.
-      , ((myModMask, xK_z), spawn "sleep 1 && xtrlock")
+      , ((myModMask, xK_z), spawn "sleep 1 && exec xtrlock")
     ]
     ++
     -- When using multiple screens, switching to another workspace causes