Merge branch 'master' of majnematic.com:davesdots

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

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"

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
@@ -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>

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)