From 19465cd61c887cafd89c26099f617eb1fc2b3ff7 Mon Sep 17 00:00:00 2001
From: David Majnemer <david.majnemer@gmail.com>
Date: Mon, 13 Sep 2010 14:21:17 -0500
Subject: [PATCH 1/5] simplify git-info

---
 git-info | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/git-info b/git-info
index e9c3637..512d641 100755
--- a/git-info
+++ b/git-info
@@ -1,18 +1,13 @@
 #! /bin/sh
 # based on a script by Duane Johnson with some simplifications
 
-CDPATH=`git rev-parse --show-cdup`
+GIT_DIR=`git rev-parse --git-dir`
 
 # not a valid git repo? leave
 if [ $? -ne 0 ] ; then
   exit
 fi
 
-# switch to the directory holding .git
-if [ -n "${CDPATH}" ] ; then
-  cd "${CDPATH}"
-fi
-
 # Show various information about this git directory
 echo "== Remote URL: `git remote -v`"
 
@@ -25,7 +20,7 @@ git branch
 echo
 
 echo "== Configuration (.git/config)"
-cat .git/config
+cat "${GIT_DIR}/config"
 echo
 
 echo "== Most Recent Commit"

From efe127c8cdccdc2f555d05441ec000480f05d242 Mon Sep 17 00:00:00 2001
From: David Majnemer <david.majnemer@apple.com>
Date: Fri, 17 Sep 2010 14:31:57 -0500
Subject: [PATCH 2/5] do not want these bindings

---
 xmonad.hs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/xmonad.hs b/xmonad.hs
index 18871bb..1a7d0eb 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -57,9 +57,7 @@ main = do
 			, ("M-S-a", windowPromptGoto defaultXPConfig { position = Top })
 			, ("M-a", windowPromptBring defaultXPConfig { position = Top })
 			, ("M-S-l", spawn "~/bin/lock")
-			, ("M-<Left>", moveTo Prev HiddenNonEmptyWS)
 			, ("M-S-<Left>", shiftToPrev)
-			, ("M-<Right>", moveTo Next HiddenNonEmptyWS)
 			, ("M-S-<Right>", shiftToNext)
 			, ("M-<Up>", windows W.focusUp)
 			, ("M-S-<Up>", windows W.swapUp)

From d31cbe1cd695d23a0cdc0dcd4e8f5917e105efa4 Mon Sep 17 00:00:00 2001
From: David Majnemer <david.majnemer@gmail.com>
Date: Fri, 17 Sep 2010 14:46:47 -0500
Subject: [PATCH 3/5] fix dependency

---
 vimrc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vimrc b/vimrc
index 690feaa..295341b 100644
--- a/vimrc
+++ b/vimrc
@@ -208,9 +208,9 @@ if has('eval')
          exe "tag " . expand("<cword>")
       endif
    endfun
-endif
 
-nmap <C-]> :call GoDefinition()<CR>
+   nmap <C-]> :call GoDefinition()<CR>
+endif
 
 if has('autocmd')
    " Shortcuts

From d059ff8cb233afb94a0e56d2786f0a98c6b4efc9 Mon Sep 17 00:00:00 2001
From: David Majnemer <david.majnemer@gmail.com>
Date: Fri, 17 Sep 2010 19:22:54 -0500
Subject: [PATCH 4/5] <escape> now disables highlighting w!! brings up sudo in
 vim

---
 vimrc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/vimrc b/vimrc
index 295341b..1742eb3 100644
--- a/vimrc
+++ b/vimrc
@@ -304,6 +304,12 @@ if has('eval')
    inoremap <buffer> <C-K> <C-R>=EmacsKill()<CR>
 endif
 
+" w!! for sudo w!
+cmap w!! w !sudo tee % >/dev/null
+
+" clear search
+nnoremap <esc> :noh<return><esc>
+
 " Disable q and Q
 map q <Nop>
 map Q <Nop>

From f863d296936529e6b4ac0e9448a09df3e5f1a113 Mon Sep 17 00:00:00 2001
From: David Alexander Majnemer <dmajnem2@yt.acm.uiuc.edu>
Date: Sat, 18 Sep 2010 04:05:06 -0500
Subject: [PATCH 5/5] remove extra eval

---
 commonsh/10_alias | 2 --
 1 file changed, 2 deletions(-)

diff --git a/commonsh/10_alias b/commonsh/10_alias
index 1e40707..65aa054 100755
--- a/commonsh/10_alias
+++ b/commonsh/10_alias
@@ -5,10 +5,8 @@ for dircolors in gdircolors dircolors ; do
 		dircolor_text=''
 		if [ -f "${HOME}/.dir_colors" ] ; then
 			dircolor_text=`cat "${HOME}/.dir_colors"`
-			eval `$dircolors -b "${HOME}/.dir_colors"`
 		elif [ -f /etc/DIR_COLORS ] ; then
 			dircolor_text=`cat /etc/DIR_COLORS`
-			eval `$dircolors -b /etc/DIR_COLORS`
 		fi
 
 		if $dircolors --version 2>/dev/null | grep GNU >/dev/null 2>&1 ; then