From 79584d0940895c4aea161ea079951ab64dd78676 Mon Sep 17 00:00:00 2001 From: Spencer Janssen Date: Mon, 5 Nov 2007 07:00:36 +0100 Subject: -Wall police darcs-hash:20071105060036-a5988-67e0d7402a87ae5d672e5b556a5a03caf6ad5559.gz --- XMonad/Config/Sjanssen.hs | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'XMonad/Config/Sjanssen.hs') diff --git a/XMonad/Config/Sjanssen.hs b/XMonad/Config/Sjanssen.hs index 76d7e1f..75969bd 100644 --- a/XMonad/Config/Sjanssen.hs +++ b/XMonad/Config/Sjanssen.hs @@ -11,7 +11,6 @@ import XMonad.Hooks.DynamicLog import XMonad.Prompt import XMonad.Prompt.Shell -import Data.Ratio import Data.Bits import qualified Data.Map as M import Graphics.X11 @@ -20,23 +19,22 @@ sjanssenConfig :: XConfig sjanssenConfig = defaultConfig { defaultGaps = [(15,0,0,0)] , terminal = "urxvt" - , workspaces = ["irc", "web"] ++ map show [3..7] ++ ["mail", "im"] + , workspaces = ["irc", "web"] ++ map show [3 .. 7 :: Int] ++ ["mail", "im"] , logHook = dynamicLogWithPP sjanssenPP , modMask = mod4Mask - , mouseBindings = \(XConfig {modMask = modMask}) -> M.fromList $ - [ ((modMask, button1), (\w -> focus w >> mouseMoveWindow w)) - , ((modMask, button2), (\w -> focus w >> windows W.swapMaster)) - , ((modMask .|. shiftMask, button1), (\w -> focus w >> mouseResizeWindow w)) ] + , mouseBindings = \(XConfig {modMask = modm}) -> M.fromList $ + [ ((modm, button1), (\w -> focus w >> mouseMoveWindow w)) + , ((modm, button2), (\w -> focus w >> windows W.swapMaster)) + , ((modm.|. shiftMask, button1), (\w -> focus w >> mouseResizeWindow w)) ] , keys = \c -> mykeys c `M.union` keys defaultConfig c , layoutHook = Layout (smartBorders (tiled ||| Mirror tiled ||| Full ||| tabbed shrinkText defaultTConf)) } where - mykeys (XConfig {modMask = modMask}) = M.fromList $ - [((modMask, xK_p ), shellPrompt myPromptConfig)] - -- default tiling algorithm partitions the screen into two panes tiled = Tall 1 0.5 0.03 -myPromptConfig = defaultXPConfig - { position = Top - , promptBorderWidth = 0 - } + mykeys (XConfig {modMask = modm}) = M.fromList $ + [((modm, xK_p ), shellPrompt myPromptConfig)] + + myPromptConfig = defaultXPConfig + { position = Top + , promptBorderWidth = 0 } -- cgit v1.2.3