X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xmonad%2Fxmonad.hs;h=bdee75d1a9d31e8498a52386890b47e5796c07a0;hb=b71680c55e6e492ed008f8ec5af3bf169b272f09;hp=26d0b3fd3a1831ffa9a1e6d212c85507ec7e8cd6;hpb=68549fc3a717992a4ca4ca8aed7d9d71a3219e62;p=config%2Fdotfiles.git

diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs
index 26d0b3f..bdee75d 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,16 @@
 -- 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.LayoutCombinators ((|||), JumpToLayout(..))
+import XMonad.Layout.Named (named)
+import XMonad.Layout.NoBorders (smartBorders)
+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
@@ -55,7 +36,7 @@ import XMonad.Layout.IM
 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)
-    otherwise           -> c
+    _                   -> c
 
 -- Create my custom layout.
 --
@@ -82,13 +63,11 @@ avoidMaster = W.modify' $ \c -> case c of
 -- (http://nathanhowell.net/2009/03/08/xmonad-and-the-gimp/) for this layout
 -- (read on 2011-06-19).
 myLayoutHook =
-    onWorkspace "5" gimp
-    $ (
-        named "Default" (smartBorders $ Mirror tiled)
+    named "Default" (smartBorders $ Mirror tiled)
         ||| named "Full" (smartBorders Full)
         ||| named "Vertical" (smartBorders tiled)
         ||| named "Limit" (smartBorders $ Mirror $ TwoPane delta ratio)
-    ) where
+  where
     -- Default tiling algorithm partitions the screen into two panes.
     tiled   = Tall nmaster delta ratio
     -- The default number of windows in the master pane.
@@ -97,13 +76,6 @@ myLayoutHook =
     delta   = 3/100
     -- Default proportion of screen occupied by master pane.
     ratio   = 1/2
-    -- Special layout for Gimp: toolbox left, dock right, main window in the
-    -- center.
-    gimp    = withIM (0.11) (Role "gimp-toolbox") $
-              reflectHoriz $
-              withIM (0.15) (Role "gimp-dock")
-              -- Layouts for the centered window.
-              (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
@@ -111,6 +83,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 +131,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"])
@@ -175,7 +151,10 @@ myKeys = [
 
         -- Switch to last active workspace, thanks to moljac024 in #xmonad on
         -- Freenode (2010-12-18 14:45 CET).
-      , ((myModMask, xK_f), toggleWS)
+      , ((myModMask, xK_b), toggleWS)
+
+      -- Lock the screen.
+      , ((myModMask, xK_z), spawn "$HOME/.xlockscreen lock")
     ]
     ++
     -- When using multiple screens, switching to another workspace causes
@@ -194,6 +173,7 @@ myKeys = [
                                       ++ [xK_F1 .. xK_F10])    -- f1..f10
         , (f, m) <- [(W.view, 0), (W.shift, shiftMask)]]
 
+main :: IO ()
 main = xmonad $ defaultConfig
     -- Change main key.
     { modMask = myModMask