Merge

git-svn-id: http://photonzero.com/dotfiles/trunk@32 23f722f6-122a-0410-8cef-c75bd312dd78

.bash_aliases

@@ -45,6 +45,7 @@ alias la='ls -alF'
 alias vi='vim'
 alias grep="grep --color=auto"
 alias screen="screen -R"
+alias dvtm="dvtm -m \"^w\""
 
 #Cosmetic/useful
 #alias naim="naim --noscreen"

.bash_profile

@@ -6,7 +6,7 @@
 #
 
 # remove /usr/games and /usr/X11R6/bin if you want
-PATH=/$HOME/bin:/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/usr/games:/usr/X11R6/bin; export PATH
+PATH=/$HOME/bin:/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/usr/games:/usr/X11R6/bin:/$HOME/.gem/ruby/1.9/bin; export PATH
 case `uname` in
 SunOS)
 	UCB_PATH=/usr/sww/lang/acl:/usr/sww/lang/jdk-1.5.0/bin:/usr/openwin/bin:/usr/dt/bin:/usr/sww/opt/java/bin:/usr/sww/bin:/share/b/grading/bin:/share/b/grading/sbin:/share/b/runas/sun4u:/share/b/bin:/home/aa/projects/scheme/bin:/usr/ucb:/usr/ccs/bin:/usr/sfw/bin; export UCB_PATH

.hgrc

@@ -0,0 +1,2 @@
+[ui]
+username = Barak Michener <me@barakmich.com>

.screenrc

@@ -79,7 +79,7 @@ bindkey "\033[15~" select 5
 # make keypad_delete send ascii 127.  this is wrong: really I ought
 # to fix all the termcaps that have kD=\177 instead of kD=\E[3~, but
 # this works and I don't care that much.
-bindkey -k kD stuff \177
+#bindkey -k kD stuff \177
 
 # by default, always let me know when background windows produce text
 #defmonitor on

.vim/filetype.vim

@@ -6,7 +6,10 @@ augroup markdown
   au! BufRead,BufNewFile *.mkd   setfiletype mkd
 augroup END
 augroup mako
-  au! BufRead,BufNewFile *.mak   setfiletype mako
+  au! BufRead,BufNewFile *.mak,*.mako  setfiletype mako
+augroup END
+augroup csv
+  au! BufNewFile,BufRead *.csv setf csv
 augroup END
 augroup python
 autocmd FileType python set omnifunc=pythoncomplete#Complete

.zprofile

@@ -6,7 +6,20 @@
 #
 
 # remove /usr/games and /usr/X11R6/bin if you want
-PATH=$HOME/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin; export PATH
+PATH=$HOME/bin:/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/usr/games:/usr/X11R6/bin:/$HOME/.gem/ruby/1.9/bin; export PATH
+case `uname` in
+SunOS)
+	UCB_PATH=/usr/sww/lang/acl:/usr/sww/lang/jdk-1.5.0/bin:/usr/openwin/bin:/usr/dt/bin:/usr/sww/opt/java/bin:/usr/sww/bin:/share/b/grading/bin:/share/b/grading/sbin:/share/b/runas/sun4u:/share/b/bin:/home/aa/projects/scheme/bin:/usr/ucb:/usr/ccs/bin:/usr/sfw/bin; export UCB_PATH
+	PATH=$PATH:$UCB_PATH; export PATH
+	;;
+Darwin)
+	MACPORTS_PATH=/opt/local/bin:/opt/local/sbin:/opt/local/usr/bin:/opt/local/usr/local/bin; export MACPORTS_PATH
+	PATH=$HOME/bin:$MACPORTS_PATH:$PATH; export PATH
+	export DISPLAY=:0.0
+	set completion-ignore-case on
+	;;
+esac
+#PATH=$HOME/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/games:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin; export PATH
 
 # Setting TERM is normally done through /etc/ttys.  Do only override
 # if you're sure that you'll never log in via telnet or xterm or a

.zsh_profile

@@ -6,7 +6,7 @@
 #
 
 # remove /usr/games and /usr/X11R6/bin if you want
-PATH=/$HOME/bin:/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/usr/games:/usr/X11R6/bin; export PATH
+PATH=$HOME/bin:/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/usr/games:/usr/X11R6/bin:$HOME/.gem/ruby/1.9/bin; export PATH
 case `uname` in
 SunOS)
 	UCB_PATH=/usr/sww/lang/acl:/usr/sww/lang/jdk-1.5.0/bin:/usr/openwin/bin:/usr/dt/bin:/usr/sww/opt/java/bin:/usr/sww/bin:/share/b/grading/bin:/share/b/grading/sbin:/share/b/runas/sun4u:/share/b/bin:/home/aa/projects/scheme/bin:/usr/ucb:/usr/ccs/bin:/usr/sfw/bin; export UCB_PATH

.zshrc

@@ -25,21 +25,21 @@ ZLS_COLORS=$LS_COLORS
 
     ###
     # Decide whether to set a screen title
-    if [[ "$TERM" == "screen" ]]; then
+#    if [[ "$TERM" == "screen" ]]; then
-	PR_STITLE=$'%{\ekzsh\e\\%}'
+#	PR_STITLE=$'%{\ekzsh\e\\%}'
-    else
+#    else
-	PR_STITLE=''
+#	PR_STITLE=''
-    fi
+#    fi
 
-    preexec () {
+#    preexec () {
-          local CMD="${1/#sudo /#}"
+#          local CMD="${1/#sudo /#}"
-          local CMD="${CMD/#nano /}"
+#          local CMD="${CMD/#nano /}"
-          local CMD="${CMD/#ssh />}"
+#          local CMD="${CMD/#ssh />}"
-          $SCREENME true || echo -ne "\ek${CMD%% *}\e\\"
+#          $SCREENME true || echo -ne "\ek${CMD%% *}\e\\"
-    }
+#    }
-    precmd () {
+    #precmd () {
-          $SCREENME true || echo -ne "\ekzsh\e\\"
+          #$SCREENME true || echo -ne "\ekzsh\e\\"
-    }
+    #}
 
 	PROMPT='$PR_STITLE$PR_LIGHT_BLUE($PR_LIGHT_YELLOW%D{%H:%M}|%!$PR_BLUE%)[%(!.$PR_RED.$PR_GREEN)%n@%m$PR_LIGHT_CYAN %~$PR_BLUE]$PR_NO_COLOUR%(!.#.$) '
 	#source .zshprompt

bin/contract

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/local/bin/python
 
 import sys
 

bin/shakegrep

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #echo $2
 #agrep -n -i -d '$$' -t -r "$*" ~/shakespeare | sed '/\/.*\/[A-Za-z]*:/ s/:\s*/:\n/'
 agrep -i -d '$$' -t -r "$1" /home/michener/shakespeare/**/*$2* | sed '/\/.*\/[A-Za-z0-9]*:/ s/:\s*/:\n/'