xmonad/xmonad.hs: Use mod4Mask in a single place.

diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs
index 874fc26d1a6c263550ea94529e5250e79269bc81..644f48316375a27342ff521e5ce4418812efc635 100644 (file)
--- a/xmonad/xmonad.hs
+++ b/xmonad/xmonad.hs
@@ -160,18 +160,22 @@ nextLayoutIncluding' layouts iterations = do
 -- 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)
     ]
     ++
     -- When using multiple screens, switching to another workspace causes
@@ -185,15 +189,14 @@ myKeys = [
     -- 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.
-    [((m .|. mod4Mask, k), windows $ f i)
+    [((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.