X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xmonad%2Fxmonad.hs;h=daa2c5a929f22b4ca61d87492d15350a0727f605;hb=7e67171f8481db2487eac3aab41fe7771bc2e1d8;hp=758a356cebe7c9110860b016341b00862899c930;hpb=6b98f2955ff87d71a8f2a095bc48481650484746;p=config%2Fdotfiles.git

diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs
index 758a356..daa2c5a 100644
--- a/xmonad/xmonad.hs
+++ b/xmonad/xmonad.hs
@@ -2,6 +2,21 @@
 --
 -- Tested with xmonad 0.9, most settings should work fine with xmonad 0.7.
 
+-- Copyright (C) 2011-2012  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
+-- the Free Software Foundation, either version 3 of the License, or
+-- (at your option) any later version.
+--
+-- This file is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-- GNU General Public License for more details.
+--
+-- You should have received a copy of the GNU General Public License
+-- along with this file.  If not, see <http://www.gnu.org/licenses/>.
+
 
 -- "hiding" necessary for LayoutCombinators.
 import XMonad hiding ( (|||) )
@@ -141,18 +156,30 @@ nextLayoutIncluding' layouts iterations = do
         -- Found allowed layout, show it.
         else refresh
 
+-- 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 = map show [1 .. 20 :: Int]
+
+-- Use Windows (= Super) key as main key as it doesn't conflict with any other
+-- key bindings.
+myModMask = mod4Mask
+
 myKeys = [
         -- Switch to next layout, but only use the listed layouts.
-        ((mod4Mask, xK_space), nextLayoutIncluding ["Default", "Full"])
+        ((myModMask, xK_space), nextLayoutIncluding ["Default", "Full"])
         -- Switch to vertical tiled layout.
-      , ((mod4Mask, xK_v), sendMessage $ JumpToLayout "Vertical")
+      , ((myModMask, xK_v), sendMessage $ JumpToLayout "Vertical")
         -- Switch to limit layout which displays only one window in the lower
         -- pane.
-      , ((mod4Mask, xK_b), sendMessage $ JumpToLayout "Limit")
+      , ((myModMask, xK_b), sendMessage $ JumpToLayout "Limit")
 
         -- Switch to last active workspace, thanks to moljac024 in #xmonad on
         -- Freenode (2010-12-18 14:45 CET).
-      , ((mod4Mask, xK_f), toggleWS)
+      , ((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
@@ -164,15 +191,16 @@ myKeys = [
     -- Thanks to the xmonad FAQ, read on 2010-06-16 13:42 CEST
     -- (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.
-    [((m .|. mod4Mask, k), windows $ f i)
-        | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_1 .. xK_9]
+    -- to use the default xmonad workspaces. Thanks to geekosaur and OODavo in
+    -- #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 = xmonad $ defaultConfig
-    -- Use Windows key as main key as it doesn't conflict with any other key
-    -- bindings.
-    { modMask = mod4Mask
+    -- Change main key.
+    { modMask = myModMask
     -- Inactive borders are black - invisible on my black screen.
     , normalBorderColor = "#000000"
     -- Active borders are dark red.
@@ -184,6 +212,8 @@ main = xmonad $ defaultConfig
     , terminal = "urxvt"
     -- Necessary for Java so it recognizes xmonad as tiling window manager.
     , startupHook = setWMName "LG3D"
+    -- Use more workspaces than the default.
+    , workspaces = myWorkspaces
     }
     `additionalKeys` myKeys