From 6837c45c08d879abaa0963e817c34cf8a6098dc7 Mon Sep 17 00:00:00 2001
From: Stefan Ritter <xeno@thehappy.de>
Date: Thu, 22 Oct 2009 14:18:10 +0200
Subject: Added workspaces to xmonad.hs

---
 xmonad/xmonad-0.8.hs | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

(limited to 'xmonad/xmonad-0.8.hs')

diff --git a/xmonad/xmonad-0.8.hs b/xmonad/xmonad-0.8.hs
index 2d7c62f..ec3a3bd 100644
--- a/xmonad/xmonad-0.8.hs
+++ b/xmonad/xmonad-0.8.hs
@@ -9,14 +9,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 +47,23 @@ myManageHook = composeAll
 myFocusFollowsMouse :: Bool
 myFocusFollowsMouse = True
 
-myLogHook = return ()
-myStartupHook = return ()
-
 myConfig = defaultConfig
 
 main = do
-xmobar <- spawnPipe "xmobar"
+xmproc <- spawnPipe "xmobar"
 xmonad $ 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 },
+        startupHook        = return()
     }
-- 
cgit v1.2.3