reduce vim bundles

.vim/bundles.vim

@@ -17,11 +17,13 @@ Bundle 'MarcWeber/vim-addon-mw-utils'
 Bundle 'Raimondi/delimitMate'
 Bundle 'tomtom/tlib_vim'
 
+
 "-----------------
 " Fast navigation
 "-----------------
 Bundle 'Lokaltog/vim-easymotion'
 
+
 "--------------
 " Fast editing
 "--------------
@@ -31,76 +33,47 @@ Bundle 'sjl/gundo.vim'
 Bundle 'godlygeek/tabular'
 Bundle 'nathanaelkane/vim-indent-guides'
 
+
 "--------------
 " IDE features
 "--------------
+Bundle 'Valloric/YouCompleteMe'
+Bundle 'scrooloose/syntastic'
 Bundle 'scrooloose/nerdtree'
 Bundle 'jistr/vim-nerdtree-tabs'
-" Bundle 'humiaozuzu/TabBar'
 Bundle 'majutsushi/tagbar'
 Bundle 'rking/ag.vim'
-Bundle 'mileszs/ack.vim'
 Bundle 'vim-scripts/EasyGrep'
 Bundle 'kien/ctrlp.vim'
 Bundle 'tpope/vim-fugitive'
-Bundle 'scrooloose/syntastic'
 Bundle 'bronson/vim-trailing-whitespace'
 Bundle 'SirVer/ultisnips'
-Bundle 'bling/vim-airline'
 Bundle 'moll/vim-bbye'
-" Bundle 'Lokaltog/powerline'
-" Bundle 'Lokaltog/vim-powerline'
-" Bundle 'mhinz/vim-signify'
+Bundle 'vim-scripts/CCTree'
+Plugin 'vim-airline/vim-airline'
+Plugin 'vim-airline/vim-airline-themes'
 
-"-------------
-" Other Utils
-"-------------
-Bundle 'nvie/vim-togglemouse'
 
 "----------------------------------------
-" Syntax/Indent for language enhancement
+" Language enhancement
 "----------------------------------------
 
-"------- markup language -------
-Bundle 'tpope/vim-markdown'
-" Bundle 'timcharper/textile.vim'
-
-"------- Ruby --------
-" Bundle 'tpope/vim-endwise'
-
-"------- Lua --------
-Bundle 'xolox/vim-misc'
-Bundle 'xolox/vim-lua-inspect'
-" Bundle 'xolox/vim-lua-ftplugin'
-
-"------- Go ----------
-Bundle 'jnwhiteh/vim-golang'
-
-"------- FPs ------
-" Bundle 'wlangstroth/vim-racket'
-" Bundle 'vim-scripts/VimClojure'
-" Bundle 'rosstimson/scala-vim-support'
-
 "------- C ----------
 Bundle 'vim-scripts/a.vim'
-Bundle 'vim-scripts/CCTree'
-Bundle 'Valloric/YouCompleteMe'
 
-"------- Rust ----------
-Bundle 'wting/rust.vim'
 
 "--------------
 " misc
 "--------------
-" Bundle 'howiefh/vimcdoc'
 Bundle 'vim-scripts/ManPageView'
 Bundle 'kien/rainbow_parentheses.vim'
 Bundle 'terryma/vim-multiple-cursors'
+Bundle 'nvie/vim-togglemouse'
 Bundle 'vim-scripts/Visual-Mark'
 Bundle 'zakj/vim-showmarks'
 Bundle 'vim-scripts/Marks-Browser'
 Bundle 'vim-scripts/DoxygenToolkit.vim'
-" Bundle 'tpope/vim-sensible'
+Plugin 'mhinz/vim-signify'
 
 
 "--------------
@@ -109,25 +82,13 @@ Bundle 'vim-scripts/DoxygenToolkit.vim'
 Bundle 'altercation/vim-colors-solarized'
 Bundle 'rickharris/vim-monokai'
 Bundle 'jaromero/vim-monokai-refined'
-Bundle 'rickharris/vim-blackboard'
-Bundle 'tpope/vim-vividchalk'
-Bundle 'Lokaltog/vim-distinguished'
-Bundle 'chriskempson/vim-tomorrow-theme'
-Bundle 'fisadev/fisa-vim-colorscheme'
 
 
 "--------------
 " Syntax
 "--------------
+Bundle 'sheerun/vim-polyglot'
 Bundle 'subosito/nginx.vim'
-" Bundle 'sheerun/vim-polyglot'
-
-
-"--------------
-" Shell
-"--------------
-Bundle 'Shougo/vimshell.vim'
-Bundle 'Shougo/vimproc.vim'
 
 
 filetype plugin indent on " required!

.vim/vimrc

@@ -115,8 +115,8 @@ set smarttab
 
 set colorcolumn=80
 
-autocmd FileType python setlocal tabstop=4 softtabstop=4 shiftwidth=4 textwidth=120
 autocmd FileType c setlocal tabstop=4 softtabstop=4 expandtab shiftwidth=4 smarttab textwidth=79
+autocmd FileType python setlocal tabstop=4 softtabstop=4 shiftwidth=4 textwidth=120
 
 
 "-----------------
@@ -342,9 +342,7 @@ endif
 nnoremap <silent> <leader>y :YcmDiag<CR>
 map <c-i> :YcmCompleter GoToDefinitionElseDeclaration<CR>
 
-" 直接触发自动补全
 let g:ycm_key_invoke_completion = '<C-Space>'
-" 黑名单,不启用
 let g:ycm_filetype_blacklist = {
       \ 'tagbar' : 1,
       \ 'gitcommit' : 1,
@@ -429,3 +427,9 @@ nnoremap ; :
 "----------------
 au BufRead,BufNewFile *.lds setfiletype ld
 
+
+"----------------
+" polyglot
+"----------------
+let g:polyglot_disabled = ['nginx']
+