From dd6a5dac7f4cf8068071733a75edbbdd0c58804e Mon Sep 17 00:00:00 2001
From: michener <michener@23f722f6-122a-0410-8cef-c75bd312dd78>
Date: Mon, 17 Oct 2011 23:18:20 +0000
Subject: [PATCH] merge fixes

git-svn-id: http://photonzero.com/dotfiles/trunk@115 23f722f6-122a-0410-8cef-c75bd312dd78
---
 .bash_aliases     | 2 +-
 .vim/filetype.vim | 3 +++
 .zprofile         | 4 ++--
 .zsh_profile      | 2 +-
 .zshrc            | 2 ++
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.bash_aliases b/.bash_aliases
index a143d49..08d73ac 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -46,7 +46,7 @@ alias la='ls -alF'
 alias vi='vim'
 alias em='emacs'
 alias grep="grep --color=auto"
-alias screen="screen -R"
+#alias screen="screen -R"
 alias dvtm="dvtm -m \"^w\""
 alias tm="tmux -2 attach"
 alias ppjson="python -mjson.tool"
diff --git a/.vim/filetype.vim b/.vim/filetype.vim
index ffac8f0..137f52a 100644
--- a/.vim/filetype.vim
+++ b/.vim/filetype.vim
@@ -25,6 +25,9 @@ augroup less
   autocmd BufNewFile,BufRead *.less set filetype=less
 augroup END
 
+
+au! BufNewFile,BufRead *.pde setf arduino
+
 augroup org
   " leave these as is:
   au! BufRead,BufWrite,BufWritePost,BufNewFile *.org 
diff --git a/.zprofile b/.zprofile
index 2ab9277..fa3a5fb 100644
--- a/.zprofile
+++ b/.zprofile
@@ -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:/$HOME/.gem/ruby/1.9/bin:$PATH; 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:$HOME/.cabal/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
@@ -15,7 +15,7 @@ SunOS)
 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
+#	export DISPLAY=:0.0
 	#set completion-ignore-case on
 	;;
 esac
diff --git a/.zsh_profile b/.zsh_profile
index 1cdaae0..2d415cf 100644
--- a/.zsh_profile
+++ b/.zsh_profile
@@ -15,7 +15,7 @@ SunOS)
 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
+	#export DISPLAY=:0.0
 #	set completion-ignore-case on
 	;;
 esac
diff --git a/.zshrc b/.zshrc
index 6e6de85..679715a 100644
--- a/.zshrc
+++ b/.zshrc
@@ -5,6 +5,8 @@ setopt extended_glob
 bindkey -e
 #ZLS_COLORS=$LS_COLORS
 
+
+export DISTCC_HOSTS='hyades01 hyades02 hyades03 hyades04'
 export GOROOT=$HOME/local/go
 export GOARCH=amd64
 export GOOS=linux