diff --git a/vimrc b/vimrc index 264b131..d799b9e 100644 --- a/vimrc +++ b/vimrc @@ -40,12 +40,12 @@ Bundle 'gmarik/vundle' Bundle 'scrooloose/syntastic' " Other programming languages -Bundle 'zepto-lang/zepto-vim' +"Bundle 'zepto-lang/zepto-vim' Bundle 'hellerve/carp-vim' -Bundle 'tikhomirov/vim-glsl' -Plugin 'rust-lang/rust.vim' -Plugin 'isRuslan/vim-es6' -Plugin 'JuliaEditorSupport/julia-vim' +"Bundle 'tikhomirov/vim-glsl' +"Plugin 'rust-lang/rust.vim' +"Plugin 'isRuslan/vim-es6' +"Plugin 'JuliaEditorSupport/julia-vim' " Extra Plugin 'editorconfig/editorconfig-vim' @@ -120,11 +120,6 @@ set mouse=a " Enable syntax highlighting syntax enable -" Adjust signscolumn and syntastic to match wombat -hi! link SignColumn LineNr -hi! link SyntasticErrorSign ErrorMsg -hi! link SyntasticWarningSign WarningMsg - " Enable filetype plugins filetype plugin on filetype indent on @@ -357,3 +352,6 @@ vnoremap h> :call Pointful() let g:syntastic_carp_checkers = ['carp'] command Cr !carp -x % + +let g:syntastic_python_checkers = ['python'] +let g:syntastic_python_python_exec = '/usr/local/bin/python3' diff --git a/zshrc b/zshrc index d42606e..d881668 100644 --- a/zshrc +++ b/zshrc @@ -38,7 +38,7 @@ export CARP_DIR=$GH_HOME/carp/Carp/ export EDITOR=/usr/local/bin/vim alias dob="git branch --merged | grep -vE '(\*)|(master)|(dev)' | xargs -n 1 git branch -d" alias vi="stty stop '' -ixoff ; stty erase '^?'; vim" -alias em="/usr/local/bin/emacs" +alias em="emacs" alias mk="make" alias g="git" alias virtualenv2="python2.7 /usr/local/lib/python2.7/site-packages/virtualenv.py"