My config uses xmonadPropLog now

This commit is contained in:
Spencer Janssen
2009-11-07 00:52:30 +00:00
parent 1a8bdd4320
commit 97a36b49a5

View File

@@ -1,5 +1,5 @@
{-# OPTIONS_GHC -fno-warn-missing-signatures #-} {-# OPTIONS_GHC -fno-warn-missing-signatures #-}
module XMonad.Config.Sjanssen (sjanssenConfig, sjanssenConfigXmobar) where module XMonad.Config.Sjanssen (sjanssenConfig) where
import XMonad hiding (Tall(..)) import XMonad hiding (Tall(..))
import qualified XMonad.StackSet as W import qualified XMonad.StackSet as W
@@ -8,7 +8,7 @@ import XMonad.Layout.Tabbed
import XMonad.Layout.HintedTile import XMonad.Layout.HintedTile
import XMonad.Config (defaultConfig) import XMonad.Config (defaultConfig)
import XMonad.Layout.NoBorders import XMonad.Layout.NoBorders
import XMonad.Hooks.DynamicLog hiding (xmobar) import XMonad.Hooks.DynamicLog
import XMonad.Hooks.ManageDocks import XMonad.Hooks.ManageDocks
import XMonad.Hooks.ManageHelpers (isFullscreen, doFullFloat) import XMonad.Hooks.ManageHelpers (isFullscreen, doFullFloat)
import XMonad.Hooks.EwmhDesktops import XMonad.Hooks.EwmhDesktops
@@ -20,12 +20,8 @@ import XMonad.Layout.TwoPane
import qualified Data.Map as M import qualified Data.Map as M
sjanssenConfigXmobar = statusBar "exec xmobar" sjanssenPP strutkey =<< sjanssenConfig
where
strutkey (XConfig {modMask = modm}) = (modm, xK_b)
sjanssenConfig = do sjanssenConfig = do
sp <- mkSpawner sp <- mkSpawner :: IO Spawner
return . ewmh $ defaultConfig return . ewmh $ defaultConfig
{ terminal = "exec urxvt" { terminal = "exec urxvt"
, workspaces = ["irc", "web"] ++ map show [3 .. 9 :: Int] , workspaces = ["irc", "web"] ++ map show [3 .. 9 :: Int]
@@ -34,6 +30,7 @@ sjanssenConfig = do
, ((modm, button2), (\w -> focus w >> windows W.swapMaster)) , ((modm, button2), (\w -> focus w >> windows W.swapMaster))
, ((modm.|. shiftMask, button1), (\w -> focus w >> mouseResizeWindow w)) ] , ((modm.|. shiftMask, button1), (\w -> focus w >> mouseResizeWindow w)) ]
, keys = \c -> mykeys sp c `M.union` keys defaultConfig c , keys = \c -> mykeys sp c `M.union` keys defaultConfig c
, logHook = dynamicLogString sjanssenPP >>= xmonadPropLog
, layoutHook = modifiers layouts , layoutHook = modifiers layouts
, manageHook = composeAll [className =? x --> doShift w , manageHook = composeAll [className =? x --> doShift w
| (x, w) <- [ ("Firefox", "web") | (x, w) <- [ ("Firefox", "web")
@@ -45,7 +42,7 @@ sjanssenConfig = do
where where
tiled = HintedTile 1 0.03 0.5 TopLeft tiled = HintedTile 1 0.03 0.5 TopLeft
layouts = (tiled Tall ||| (tiled Wide ||| Full)) ||| tabbed shrinkText myTheme layouts = (tiled Tall ||| (tiled Wide ||| Full)) ||| tabbed shrinkText myTheme
modifiers = smartBorders modifiers = avoidStruts . smartBorders
mykeys sp (XConfig {modMask = modm}) = M.fromList $ mykeys sp (XConfig {modMask = modm}) = M.fromList $
[((modm, xK_p ), shellPromptHere sp myPromptConfig) [((modm, xK_p ), shellPromptHere sp myPromptConfig)
@@ -55,6 +52,7 @@ sjanssenConfig = do
,((modm .|. shiftMask, xK_0 ), windows $ copyToAll) ,((modm .|. shiftMask, xK_0 ), windows $ copyToAll)
,((modm, xK_z ), layoutScreens 2 $ TwoPane 0.5 0.5) ,((modm, xK_z ), layoutScreens 2 $ TwoPane 0.5 0.5)
,((modm .|. shiftMask, xK_z ), rescreen) ,((modm .|. shiftMask, xK_z ), rescreen)
, ((modm , xK_b ), sendMessage ToggleStruts)
] ]
myFont = "xft:Bitstream Vera Sans Mono:pixelsize=10" myFont = "xft:Bitstream Vera Sans Mono:pixelsize=10"