diff options
| author | Daniel Schoepe <daniel.schoepe@gmail.com> | 2009-11-07 11:36:19 +0100 |
|---|---|---|
| committer | Daniel Schoepe <daniel.schoepe@gmail.com> | 2009-11-07 11:36:19 +0100 |
| commit | 0baf18c83a50c016620a2a3ce845e04499672f71 (patch) | |
| tree | 7ebbad84f1f8fed7e966f06a8ea9ea4db9b762c8 | |
| parent | 737258a32fe0d73c589e7200a608bc72923b5c9c (diff) | |
| download | XMonadContrib-0baf18c83a50c016620a2a3ce845e04499672f71.tar.gz XMonadContrib-0baf18c83a50c016620a2a3ce845e04499672f71.tar.xz XMonadContrib-0baf18c83a50c016620a2a3ce845e04499672f71.zip | |
Fixed conflict between X.U.ExtensibleState and X.C.Sjanssen
Ignore-this: 80f4bb218574d7c528af17473c6e4f66
darcs-hash:20091107103619-7f603-af5e7e87450ba2cd2b6cfad5394b08e4d99c6de1.gz
| -rw-r--r-- | XMonad/Config/Sjanssen.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/XMonad/Config/Sjanssen.hs b/XMonad/Config/Sjanssen.hs index be5a72b..a2676e2 100644 --- a/XMonad/Config/Sjanssen.hs +++ b/XMonad/Config/Sjanssen.hs @@ -20,16 +20,16 @@ import XMonad.Layout.TwoPane import qualified Data.Map as M -sjanssenConfig = do - sp <- mkSpawner - return . ewmh $ defaultConfig +sjanssenConfig = + ewmh $ defaultConfig { terminal = "exec urxvt" , workspaces = ["irc", "web"] ++ map show [3 .. 9 :: Int] , 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 sp c `M.union` keys defaultConfig c + , keys = \c -> mykeys c `M.union` keys defaultConfig c + , logHook = dynamicLogString sjanssenPP >>= xmonadPropLog , layoutHook = modifiers layouts , manageHook = composeAll [className =? x --> doShift w | (x, w) <- [ ("Firefox", "web") |