barak/dotfiles
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge fixes

Browse source 
git-svn-id: http://photonzero.com/dotfiles/trunk@115 23f722f6-122a-0410-8cef-c75bd312dd78
This commit is contained in:
michener 2011-10-17 23:18:20 +00:00
parent 8c1d4265bd
commit dd6a5dac7f
5 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.bash_aliases
View file

@ -46,7 +46,7 @@ alias la='ls -alF'
alias vi='vim' alias vi='vim'
alias em='emacs' alias em='emacs'
alias grep="grep --color=auto" alias grep="grep --color=auto"
alias screen="screen -R" #alias screen="screen -R"
alias dvtm="dvtm -m \"^w\"" alias dvtm="dvtm -m \"^w\""
alias tm="tmux -2 attach" alias tm="tmux -2 attach"
alias ppjson="python -mjson.tool" alias ppjson="python -mjson.tool"

3
.vim/filetype.vim
View file

@ -25,6 +25,9 @@ augroup less
autocmd BufNewFile,BufRead *.less set filetype=less autocmd BufNewFile,BufRead *.less set filetype=less
augroup END augroup END
au! BufNewFile,BufRead *.pde setf arduino
augroup org augroup org
" leave these as is: " leave these as is:
au! BufRead,BufWrite,BufWritePost,BufNewFile *.org au! BufRead,BufWrite,BufWritePost,BufNewFile *.org

4
.zprofile
View file

@ -6,7 +6,7 @@
# #
# remove /usr/games and /usr/X11R6/bin if you want # 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 case `uname` in
SunOS) 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 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) Darwin)
MACPORTS_PATH=/opt/local/bin:/opt/local/sbin:/opt/local/usr/bin:/opt/local/usr/local/bin; export MACPORTS_PATH 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 PATH=$HOME/bin:$MACPORTS_PATH:$PATH; export PATH
export DISPLAY=:0.0 # export DISPLAY=:0.0
#set completion-ignore-case on #set completion-ignore-case on
;; ;;
esac esac

2
.zsh_profile
View file

@ -15,7 +15,7 @@ SunOS)
Darwin) Darwin)
MACPORTS_PATH=/opt/local/bin:/opt/local/sbin:/opt/local/usr/bin:/opt/local/usr/local/bin; export MACPORTS_PATH 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 PATH=$HOME/bin:$MACPORTS_PATH:$PATH; export PATH
export DISPLAY=:0.0 #export DISPLAY=:0.0
# set completion-ignore-case on # set completion-ignore-case on
;; ;;
esac esac

2
.zshrc
View file

@ -5,6 +5,8 @@ setopt extended_glob
bindkey -e bindkey -e
#ZLS_COLORS=$LS_COLORS #ZLS_COLORS=$LS_COLORS
export DISTCC_HOSTS='hyades01 hyades02 hyades03 hyades04'
export GOROOT=$HOME/local/go export GOROOT=$HOME/local/go
export GOARCH=amd64 export GOARCH=amd64
export GOOS=linux export GOOS=linux