X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xmonad%2Fxmonad.hs;h=69e3da8bd51fdf08498d7ec06ee7004271b04723;hb=a0ce87b8d018fdf1595b12e1275b2d1b63f6b3ea;hp=e78a1d71098c9ea042aed30ebab0092d8eb97fdd;hpb=62a7d2081e7a2273b3deb69458382b8ef48559a4;p=config%2Fdotfiles.git

diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs
index e78a1d7..69e3da8 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.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
--- 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
 
 
 -- Prevent new windows from spawning in the master pane. Taken from
@@ -111,6 +95,7 @@ myLayoutHook =
 --
 -- Also some applications are spawned on specific workspaces. Thanks to
 -- dschoepe and ivanm in #xmonad on Freenode (2009-07-12 14:50 CEST).
+myManageHook :: ManageHook
 myManageHook = composeOne
     -- Browser on "2".
     [ className =? "Iceweasel"          -?> doF (W.shift "2")
@@ -158,12 +143,15 @@ nextLayoutIncluding' layouts iterations = do
 
 -- Use additional workspaces. Access with meta 1,2,..,9,0 for the first ten,
 -- meta f1,f2,..,f10 for the second ten workspaces (see mappings below).
+myWorkspaces :: [String]
 myWorkspaces = map show [1 .. 20 :: Int]
 
 -- Use Windows (= Super) key as main key as it doesn't conflict with any other
 -- key bindings.
+myModMask :: KeyMask
 myModMask = mod4Mask
 
+myKeys :: [((KeyMask, KeySym), X ())]
 myKeys = [
         -- Switch to next layout, but only use the listed layouts.
         ((myModMask, xK_space), nextLayoutIncluding ["Default", "Full"])
@@ -176,6 +164,10 @@ myKeys = [
         -- Switch to last active workspace, thanks to moljac024 in #xmonad on
         -- Freenode (2010-12-18 14:45 CET).
       , ((myModMask, xK_f), toggleWS)
+
+      -- Lock the screen. The sleep is necessary to allow xtrlock to grab the
+      -- keyboard input.
+      , ((myModMask, xK_z), spawn "sleep 1 && exec xtrlock")
     ]
     ++
     -- When using multiple screens, switching to another workspace causes
@@ -188,12 +180,13 @@ myKeys = [
     -- (http://www.haskell.org/haskellwiki/Xmonad/Frequently_asked_questions).
     -- Thanks to MrElendig in #xmonad on Freenode (2010-06-17 17:16 CEST) how
     -- to use the default xmonad workspaces. Thanks to geekosaur and OODavo in
-    -- #xmonad on Freenode (2012-12-23 01:14 CET) how to use my workspaces.
+    -- #xmonad on Freenode (2012-12-23 01:14 CET) how to use more workspaces.
     [((m .|. myModMask, k), windows $ f i)
         | (i, k) <- zip myWorkspaces ([xK_1 .. xK_9] ++ [xK_0] -- 1..9,0
                                       ++ [xK_F1 .. xK_F10])    -- f1..f10
         , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]]
 
+main :: IO ()
 main = xmonad $ defaultConfig
     -- Change main key.
     { modMask = myModMask