xmonad: cleanup imports

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

diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs
index 73af0bfe066a5bc6f9b8e3f8d26d92f9d8e53ea6..aed53efd0f90bbfbe1f43f21f86194043fc275d2 100644 (file)
--- 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
@@ -156,18 +140,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
@@ -179,15 +175,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.
@@ -199,6 +196,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