xinitrc: Fix indentation.

[config/dotfiles.git] / xmonad.hs

diff --git a/xmonad.hs b/xmonad.hs
index 1a0b498bda873dcac90c8cc150ca74fb93110ca7..367c93be01aa7c2d3efa19fa28f3a879e5c7e3b7 100644 (file)
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -16,13 +16,17 @@ import XMonad.Layout.NoBorders
 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
 
 
 -- Prevent new windows from spawning in the master pane. Taken from
 -- http://haskell.org/haskellwiki/Xmonad/Frequently_asked_questions on
 -- 2009-06-30. Thanks. Modified to not steal focus from the master pane when a
 -- new window is created, thanks to vav in #xmonad on Freenode (2010-04-15
--- 21:59).
+-- 21:59 CEST).
 avoidMaster :: W.StackSet i l a s sd -> W.StackSet i l a s sd
 avoidMaster = W.modify' $ \c -> case c of
     W.Stack t [] (r:rs) -> W.Stack r [] (t:rs)
@@ -36,12 +40,12 @@ avoidMaster = W.modify' $ \c -> case c of
 -- spawn in the master pane avoidMaster (see below) is used. Borders are only
 -- drawn when the screen has more then one window (smartBorders).
 --
--- Thanks to jrick in #xmonad on Freenode (2009-06-29 22:19) for telling me
--- how to remove the vertical tiled layout.
+-- Thanks to jrick in #xmonad on Freenode (2009-06-29 22:19 CEST) for telling
+-- me how to remove the vertical tiled layout.
 --
 -- toggleLayouts is used to allow switching to vertical tiled layout but not
 -- using it with meta-space (see below in key bindings). Thanks to ml| in
--- #xmonad on Freenode (2010-06-14 09:49) how to use toggleLayouts.
+-- #xmonad on Freenode (2010-06-14 09:49 CEST) how to use toggleLayouts.
 myLayoutHook = toggleLayouts tiled $ smartBorders $ Mirror tiled ||| Full
     where
     -- Default tiling algorithm partitions the screen into two panes.
@@ -55,10 +59,10 @@ myLayoutHook = toggleLayouts tiled $ smartBorders $ Mirror tiled ||| Full
 
 -- Don't spawn new windows in the master pane (which is at the top of the
 -- screen). Thanks to dschoepe, aavogt and especially vav in #xmonad on
--- Freenode (2009-06-30 02:10f).
+-- Freenode (2009-06-30 02:10f CEST).
 --
 -- Also some applications are spawned on specific workspaces. Thanks to
--- dschoepe and ivanm in #xmonad on Freenode (2009-07-12 14:50).
+-- dschoepe and ivanm in #xmonad on Freenode (2009-07-12 14:50 CEST).
 myManageHook = composeOne
     -- Browser on "2".
     [ className =? "Iceweasel"          -?> doF (W.shift "2")
@@ -70,11 +74,11 @@ myManageHook = composeOne
     -- Wine on "4".
     , className =? "Wine"               -?> doF (W.shift "4")
 
-    -- Don't span new windows in the master pane.
+    -- Don't spawn new windows in the master pane.
     , return True -?> doF avoidMaster
     -- Prevent windows which get moved to other workspaces from removing the
     -- focus of the currently selected window. Thanks to vav in #xmonad on
-    -- Freenode (2010-04-15 21:04).
+    -- Freenode (2010-04-15 21:04 CEST).
     , return True -?> doF W.focusDown
     ]
 
@@ -82,6 +86,9 @@ myKeys = [
         -- Switch to additional layout (vertical tiled) defined by
         -- toggleLayouts above.
         ((mod4Mask, xK_v), sendMessage ToggleLayout)
+        -- Switch to last active workspace, thanks to moljac024 in #xmonad on
+        -- Freenode (2010-12-18 14:45 CET).
+      , ((mod4Mask, xK_f), toggleWS)
     ]
     ++
     -- When using multiple screens, switching to another workspace causes
@@ -90,27 +97,29 @@ myKeys = [
     -- code changes it to just switch to the screen where the workspace is
     -- already displayed.
     --
-    -- Thanks to the Xmonad FAQ, read on 2010-06-16 13:42
+    -- 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) to use
-    -- the default XMonad workspaces.
+    -- Thanks to MrElendig in #xmonad on Freenode (2010-06-17 17:16 CEST) to
+    -- use the default XMonad workspaces.
     [((m .|. mod4Mask, k), windows $ f i)
         | (i, k) <- zip (XMonad.workspaces defaultConfig) [xK_1 .. xK_9]
         , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]]
 
 main = xmonad $ defaultConfig
-    -- Use Windows key as main key so it doesn't conflict with any other key
+    -- Use Windows key as main key as it doesn't conflict with any other key
     -- bindings.
     { modMask = mod4Mask
     -- Inactive borders are black - invisible on my black screen.
     , normalBorderColor = "#000000"
-    -- Active border is dark red.
+    -- Active borders are dark red.
     , focusedBorderColor = "#990000"
     -- Use my layout and manage hooks (see above).
     , layoutHook = myLayoutHook
     , manageHook = myManageHook
     -- Use unicode rxvt as my terminal.
     , terminal = "urxvt"
+    -- Necessary for Java so it recognizes XMonad as tiling window manager.
+    , startupHook = setWMName "LG3D"
     }
     `additionalKeys` myKeys