diff --git a/configs/vimrc-generated b/configs/vimrc-generated index 82f3bb0..dc76abd 100644 --- a/configs/vimrc-generated +++ b/configs/vimrc-generated @@ -27,7 +27,7 @@ NeoBundleFetch 'Shougo/neobundle.vim' "***************************************************************************** "" NeoBundle install packages "***************************************************************************** -" NeoBundle 'scrooloose/nerdtree' +NeoBundle 'scrooloose/nerdtree' NeoBundle 'tpope/vim-commentary' NeoBundle 'tpope/vim-fugitive' NeoBundle 'kien/ctrlp.vim' @@ -35,7 +35,7 @@ NeoBundle 'bling/vim-airline' NeoBundle 'airblade/vim-gitgutter' NeoBundle 'sheerun/vim-polyglot' NeoBundle 'vim-scripts/grep.vim' -NeoBundle 'vim-scripts/CSApprox' +" NeoBundle 'vim-scripts/CSApprox' "" Snippets " NeoBundle "MarcWeber/vim-addon-mw-utils" @@ -54,6 +54,7 @@ NeoBundle 'altercation/vim-colors-solarized' NeoBundle 'w0ng/vim-hybrid' "" Custom bundles +NeoBundle 'jiangmiao/auto-pairs' "" Python Bundle NeoBundle "davidhalter/jedi-vim" @@ -150,26 +151,26 @@ set nocursorline set guioptions=egmrt set gfn=Monospace\ 8 -if has("gui_running") - if has("gui_mac") || has("gui_macvim") - set guifont=Menlo:h12 - set transparency=7 - endif -else - let g:CSApprox_loaded = 1 - - if $COLORTERM == 'gnome-terminal' - set term=xterm-256color - else - if $TERM == 'xterm' - set term=xterm-256color - endif - endif -endif - -if &term =~ '256color' - set t_ut= -endif +" if has("gui_running") +" if has("gui_mac") || has("gui_macvim") +" set guifont=Menlo:h12 +" set transparency=7 +" endif +" else +" let g:CSApprox_loaded = 1 + +" if $COLORTERM == 'gnome-terminal' +" set term=xterm-256color +" else +" if $TERM == 'xterm' +" set term=xterm-256color +" endif +" endif +" endif + +" if &term =~ '256color' +" set t_ut= +" endif "" Disable the blinking cursor. set gcr=a:blinkon0 @@ -382,6 +383,6 @@ let g:javascript_enable_domhtmlcss = 1 "" Include user's local vim config -if filereadable(expand("~/.vimrc.local")) - source ~/.vimrc.local +if filereadable(expand("~/.vim/local.vim")) + source ~/.vim/local.vim endif \ No newline at end of file