Weekly commit

3 files changed, 9 insertions, 13 deletions

diff --git a/xmonad/xmonad-0.8.hs b/xmonad/xmonad-0.8.hs
index a9304ac..1c3392d 100644
--- a/xmonad/xmonad-0.8.hs
+++ b/xmonad/xmonad-0.8.hs
@@ -1,8 +1,7 @@
 import XMonad
 import XMonad.Hooks.DynamicLog
 import XMonad.Hooks.ManageDocks
-import XMonad.Hooks.UrgencyHook
-import XMonad.Util.Run (spawnPipe)
+import XMonad.Hooks.EwmhDesktops
 import XMonad.Actions.CycleWS
 import System.Exit
 import System.IO
@@ -25,9 +24,8 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
     , ((modMask,               xK_h     ), prevWS)
     , ((modMask,               xK_f     ), nextWS)
     , ((modMask .|. shiftMask, xK_q     ), io (exitWith ExitSuccess))
-    --, ((modMask,               xK_h     ), withFocused $ windows . W.sink)
-    --, ((modMask              , xK_h     ), sendMessage (IncMasterN 1))
-    --, ((modMask              , xK_f     ), sendMessage (IncMasterN (-1)))
+    , ((modMask              , xK_n     ), sendMessage (IncMasterN 1))
+    , ((modMask              , xK_t     ), sendMessage (IncMasterN (-1)))
     ]
     ++
  
@@ -51,10 +49,8 @@ myFocusFollowsMouse = True
 myConfig = defaultConfig
 
 main = do
-xmproc <- spawnPipe "xmobar"
-xmonad $ withUrgencyHook NoUrgencyHook defaultConfig {
+xmonad $ defaultConfig {
 	manageHook         = manageDocks <+> manageHook defaultConfig,
-	layoutHook         = avoidStruts $ layoutHook defaultConfig,
         terminal           = "x-terminal-emulator",
         focusFollowsMouse  = myFocusFollowsMouse,
         borderWidth        = 1,
@@ -65,9 +61,8 @@ xmonad $ withUrgencyHook NoUrgencyHook defaultConfig {
         focusedBorderColor = "#ff0000",
         keys               = myKeys,
         mouseBindings      = myMouseBindings,
-        logHook            = dynamicLogWithPP $ xmobarPP { 
-			     		      ppOutput = hPutStrLn xmproc , 
-					      ppTitle = xmobarColor "green" "" . shorten 50 , 
-					      ppUrgent = xmobarColor "yellow" "red" . shorten 50 },
+        logHook            = ewmhDesktopsLogHook,
+        --logHook            = dynamicLog,
+	layoutHook         = avoidStruts $ layoutHook defaultConfig,
         startupHook        = return()
     }
diff --git a/xorg/xinitrc b/xorg/xinitrc
index bfb2630..50e8639 100755
--- a/xorg/xinitrc
+++ b/xorg/xinitrc
@@ -6,6 +6,6 @@ source ~/.keychain/`hostname`-sh > /dev/null
 feh --bg-tile ~/media/pictures/wallpaper/$(ls ~/media/pictures/wallpaper/ | sed -n $((RANDOM%$(ls ~/media/pictures/wallpaper/ | wc -l)+1))p)
 blueman-applet &
 wicd-client &
+xfce4-panel &
 
 exec $WM
-# vim: set tw=0:
diff --git a/zsh/zshrc b/zsh/zshrc
index 1f54a7d..b07d7f0 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -60,6 +60,7 @@ alias agu="sudo aptitude update"
 alias agdu="sudo aptitude dist-upgrade"
 alias acs="apt-cache search"
 alias agi="sudo aptitude install"
+alias as="aptitude show"
 alias purge="sudo apt-get --purge autoremove"
 
 alias svn-uscan='uscan --verbose --force-download --rename --repack --destdir=../tarballs'