diff --git a/.gitignore b/.gitignore index 0faf56b..232a316 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ +vim/.netrwhist vim/bundle/* !vim/bundle/vundle/* diff --git a/vimrc b/vimrc index 605fa1b..2efaaf5 100644 --- a/vimrc +++ b/vimrc @@ -30,6 +30,7 @@ Bundle 'altercation/vim-colors-solarized' Bundle 'kien/ctrlp.vim' Bundle 'gregsexton/MatchTag' Bundle 'closetag.vim' +Bundle 'rstacruz/sparkup' " Snipmate Bundle 'MarcWeber/vim-addon-mw-utils' diff --git a/zshrc b/zshrc index 9092000..935f171 100644 --- a/zshrc +++ b/zshrc @@ -31,7 +31,15 @@ source $ZSH/oh-my-zsh.sh # Customize to your needs... alias vi=vim -# export TERM="screen-256color" export EDITOR=vim - export PATH="/usr/local/bin:$PATH" + +# VCS stuff +export P4USER=dswan +export P4PORT="humu.insors.net:1666" +export P4CONFIG=p4.cfg +export P4EDITOR=vim +export SVN_EDITOR=vim + +# sync visidev to latest Perforce +alias visidev="ssh root@visidev.iocom.com 'cd /; p4 sync'"