Merge branch 'master' of git://github.com/dustinswan/dotfiles
This commit is contained in:
commit
1e2055ca46
3 changed files with 12 additions and 2 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1,2 +1,3 @@
|
||||||
|
vim/.netrwhist
|
||||||
vim/bundle/*
|
vim/bundle/*
|
||||||
!vim/bundle/vundle/*
|
!vim/bundle/vundle/*
|
||||||
|
|
|
||||||
1
vimrc
1
vimrc
|
|
@ -30,6 +30,7 @@ Bundle 'altercation/vim-colors-solarized'
|
||||||
Bundle 'kien/ctrlp.vim'
|
Bundle 'kien/ctrlp.vim'
|
||||||
Bundle 'gregsexton/MatchTag'
|
Bundle 'gregsexton/MatchTag'
|
||||||
Bundle 'closetag.vim'
|
Bundle 'closetag.vim'
|
||||||
|
Bundle 'rstacruz/sparkup'
|
||||||
|
|
||||||
" Snipmate
|
" Snipmate
|
||||||
Bundle 'MarcWeber/vim-addon-mw-utils'
|
Bundle 'MarcWeber/vim-addon-mw-utils'
|
||||||
|
|
|
||||||
12
zshrc
12
zshrc
|
|
@ -31,7 +31,15 @@ source $ZSH/oh-my-zsh.sh
|
||||||
|
|
||||||
# Customize to your needs...
|
# Customize to your needs...
|
||||||
alias vi=vim
|
alias vi=vim
|
||||||
# export TERM="screen-256color"
|
|
||||||
export EDITOR=vim
|
export EDITOR=vim
|
||||||
|
|
||||||
export PATH="/usr/local/bin:$PATH"
|
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'"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue