Several things:

* Added emacs config
* Using emacs in gitconfig
* Modified xmonad.hs for using xmobar
* Added 'e' alias for emacs

5 files changed, 32 insertions, 15 deletions

diff --git a/emacs b/emacs
new file mode 100644
index 0000000..f49670f
--- /dev/null
+++ b/emacs
@@ -0,0 +1,7 @@
+;; line numbers
+(require 'linum)
+(global-linum-mode)
+(setq linum-format "%d ")
+
+;; no backups
+(setq make-backup-files nil)
diff --git a/gitconfig b/gitconfig
index 452b561..511dc9f 100644
--- a/gitconfig
+++ b/gitconfig
@@ -6,3 +6,5 @@
 	signingkey = 70557E3F
 [colors]
 	ui = auto
+[core]
+	editor = emacs
diff --git a/xmonad/xmonad-0.8.hs b/xmonad/xmonad-0.8.hs
index 0ea6d0b..2d7c62f 100644
--- a/xmonad/xmonad-0.8.hs
+++ b/xmonad/xmonad-0.8.hs
@@ -1,18 +1,21 @@
 import XMonad
+import XMonad.Hooks.DynamicLog
 import XMonad.Hooks.ManageDocks
+import XMonad.Util.Run (spawnPipe)
+import XMonad.Actions.CycleWS
 import System.Exit
+import System.IO
  
 import qualified XMonad.StackSet as W
 import qualified Data.Map        as M
  
-myTerminal      = "urxvt"
+myTerminal      = "x-terminal-emulator"
 myBorderWidth   = 1
 myModMask       = mod1Mask
 myNumlockMask   = mod2Mask
 myWorkspaces    = ["1","2","3","4","5","6","7","8","9"]
 myNormalBorderColor  = "#dddddd"
 myFocusedBorderColor = "#ff0000"
-myDefaultGaps   = [(0,0,0,0)]
  
 myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
     [ ((modMask,               xK_Return), spawn $ XMonad.terminal conf)
@@ -26,9 +29,12 @@ myKeys conf@(XConfig {XMonad.modMask = modMask}) = M.fromList $
     , ((modMask,               xK_m     ), windows W.focusMaster  )
     , ((modMask .|. shiftMask, xK_r	), windows W.swapDown  )
     , ((modMask .|. shiftMask, xK_g	), windows W.swapUp  )
-    , ((modMask,               xK_h     ), withFocused $ windows . W.sink)
-    , ((modMask              , xK_h     ), sendMessage (IncMasterN 1))
-    , ((modMask              , xK_f     ), sendMessage (IncMasterN (-1)))
+    , ((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)))
     ]
     ++
  
@@ -41,20 +47,22 @@ myMouseBindings (XConfig {XMonad.modMask = modMask}) = M.fromList $
     , ((modMask, button2), (\w -> focus w >> windows W.swapMaster))
     , ((modMask, button3), (\w -> focus w >> mouseResizeWindow w))
     ]
- 
+
 myManageHook = composeAll
     [ className =? "MPlayer"        --> doFloat
     , className =? "Gimp"           --> doFloat ]
- 
+
 myFocusFollowsMouse :: Bool
 myFocusFollowsMouse = True
- 
+
 myLogHook = return ()
 myStartupHook = return ()
- 
-main = xmonad defaults
- 
-defaults = defaultConfig {
+
+myConfig = defaultConfig
+
+main = do
+xmobar <- spawnPipe "xmobar"
+xmonad $ defaultConfig {
 	manageHook         = manageDocks <+> manageHook defaultConfig,
 	layoutHook         = avoidStruts $ layoutHook defaultConfig,
         terminal           = myTerminal,
@@ -65,7 +73,6 @@ defaults = defaultConfig {
         workspaces         = myWorkspaces,
         normalBorderColor  = myNormalBorderColor,
         focusedBorderColor = myFocusedBorderColor,
- 	defaultGaps        = myDefaultGaps,
         keys               = myKeys,
         mouseBindings      = myMouseBindings,
         logHook            = myLogHook,
diff --git a/xorg/xinitrc b/xorg/xinitrc
index 705955a..bfb2630 100755
--- a/xorg/xinitrc
+++ b/xorg/xinitrc
@@ -1,9 +1,9 @@
 #!/bin/bash
-WM='awesome'
+WM='xmonad'
 
 keychain --clear -q ~/.ssh/id_rsa
 source ~/.keychain/`hostname`-sh > /dev/null
-feh --bg-tile ~/media/pictures/wallpaper/$(ls ~/media/pictures/wallpaper/*_ds* | sed -n $((RANDOM%$(ls ~/media/pictures/wallpaper/ | wc -l)+1))p)
+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 &
 
diff --git a/zsh/zshrc b/zsh/zshrc
index 88d7c34..1f54a7d 100644
--- a/zsh/zshrc
+++ b/zsh/zshrc
@@ -40,6 +40,7 @@ alias v="vim"
 mail() { mutt -F ~/.secgit/muttrc.$1 }
 
 alias a='acpi'
+alias e='emacs'
 alias g='git'
 alias gitserv="git daemon --verbose --reuseaddr --base-path=. --export-all ./.git"
 alias iso="genisoimage -l -J -R -o cd.iso"