diff options
author | Stefan Ritter <xeno@thehappy.de> | 2009-10-27 11:13:17 +0100 |
---|---|---|
committer | Stefan Ritter <xeno@thehappy.de> | 2009-10-27 11:13:17 +0100 |
commit | 31748d1dd98125c2cb8ec4bdcbb6bb2958643d50 (patch) | |
tree | 78e760a96bf1427fa7948c5027363a72eb452505 /xmonad/xmonad-0.8.hs | |
parent | 4dc2be9569d695150c1c2772a1a0cc0693fdd62a (diff) | |
parent | 34552732a27ee197bd91d91d709047cefed6bf6e (diff) |
Merge branch 'master' of git@fucktheforce.de:xeno
Diffstat (limited to 'xmonad/xmonad-0.8.hs')
-rw-r--r-- | xmonad/xmonad-0.8.hs | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/xmonad/xmonad-0.8.hs b/xmonad/xmonad-0.8.hs index 2d7c62f..a9304ac 100644 --- a/xmonad/xmonad-0.8.hs +++ b/xmonad/xmonad-0.8.hs @@ -1,6 +1,7 @@ import XMonad import XMonad.Hooks.DynamicLog import XMonad.Hooks.ManageDocks +import XMonad.Hooks.UrgencyHook import XMonad.Util.Run (spawnPipe) import XMonad.Actions.CycleWS import System.Exit @@ -9,14 +10,6 @@ import System.IO import qualified XMonad.StackSet as W import qualified Data.Map as M -myTerminal = "x-terminal-emulator" -myBorderWidth = 1 -myModMask = mod1Mask -myNumlockMask = mod2Mask -myWorkspaces = ["1","2","3","4","5","6","7","8","9"] -myNormalBorderColor = "#dddddd" -myFocusedBorderColor = "#ff0000" - myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $ [ ((modMask, xK_Return), spawn $ XMonad.terminal conf) , ((modMask, xK_q ), spawn "exe=`dmenu_path | dmenu` && eval \"exec $exe\"") @@ -55,26 +48,26 @@ myManageHook = composeAll myFocusFollowsMouse :: Bool myFocusFollowsMouse = True -myLogHook = return () -myStartupHook = return () - myConfig = defaultConfig main = do -xmobar <- spawnPipe "xmobar" -xmonad $ defaultConfig { +xmproc <- spawnPipe "xmobar" +xmonad $ withUrgencyHook NoUrgencyHook defaultConfig { manageHook = manageDocks <+> manageHook defaultConfig, layoutHook = avoidStruts $ layoutHook defaultConfig, - terminal = myTerminal, + terminal = "x-terminal-emulator", focusFollowsMouse = myFocusFollowsMouse, - borderWidth = myBorderWidth, - modMask = myModMask, - numlockMask = myNumlockMask, - workspaces = myWorkspaces, - normalBorderColor = myNormalBorderColor, - focusedBorderColor = myFocusedBorderColor, + borderWidth = 1, + modMask = mod1Mask, + numlockMask = mod2Mask, + workspaces = ["1","2","3","4","5","6","7","8","9"], + normalBorderColor = "#dddddd", + focusedBorderColor = "#ff0000", keys = myKeys, mouseBindings = myMouseBindings, - logHook = myLogHook, - startupHook = myStartupHook + logHook = dynamicLogWithPP $ xmobarPP { + ppOutput = hPutStrLn xmproc , + ppTitle = xmobarColor "green" "" . shorten 50 , + ppUrgent = xmobarColor "yellow" "red" . shorten 50 }, + startupHook = return() } |