refresh totally

Author: nullne

README.md

@@ -1,8 +1,8 @@
 ####快速配置
-	git clone https://github.com/nullne/vimrc.git ~/.vim_runtime
+	git clone https://github.com/nullne/vimrc.git ~/.vim
 
 	# 安装基本版
-	~.vim_runtime/basic_install.sh
+	~.vim/basic_install.sh
 
 	# 安装终极版
-	~/.vim_runtime/ultimate_install.sh
+	~/.vim/ultimate_install.sh

bundle/AutoTag

@@ -1 +1 @@
-Subproject commit b7cdda2996142c6afd8202e3b1c8da97632b6711
+Subproject commit bb850cf07fe25693c535cb39b276319818ab0208

bundle/Conque-Shell

@@ -1 +1 @@
-Subproject commit b5d3fe66a58a13d2ff8b6391f4387608496a030f
+Subproject commit cd99e43613202d56b2adfc8f9bd216734a9601fd

bundle/PHP-Indenting-for-VIm

@@ -1 +1 @@
-Subproject commit 30f856893579d34531ac256e1f6752d809956025
+Subproject commit 52f3af7ca8bc6a9988fcd80c7189591330fbcadd

bundle/SyntaxAttr.vim

@@ -1 +1 @@
-Subproject commit 352e827a6c4dbe845c3c528c1d03a5bdd18dda62
+Subproject commit bb0c614120474a3519c692834afb7b69b097b465

bundle/The-NERD-Commenter

@@ -1 +1 @@
-Subproject commit 96c07746b46c12d0aca7a5276cc5bd0a260b82fe
+Subproject commit d280b15ba9388ab93f3401b26877a13fdb8ed816

bundle/YouCompleteMe

@@ -1 +1 @@
-Subproject commit 8775df13b80744a83ea33b407354e9d4cea05b7c
+Subproject commit f60e66f6f9f32dbb718d58ac9de2bad6bc006dce

bundle/ctrlp.vim

@@ -1 +1 @@
-Subproject commit 9c8468e83232c3e45b730d2d0b28d609053dec05
+Subproject commit da4bfe5a409cebc4bd79d0d68c2f0a68b2d6c598

bundle/custom_vimconf

@@ -1 +1 @@
-Subproject commit 59513edd4784baf3d7350b91be7b739faddaf164
+Subproject commit 4486e2ed372df9bd3fef219fc8358cde577d9972

bundle/emmet-vim

@@ -1 +1 @@
-Subproject commit 50a779443604dccd3cbb00171c23bae8981bf56e
+Subproject commit e9ee1caada3338387ed4702db463323cfee8e925

bundle/gocode

@@ -1 +1 @@
-Subproject commit 89c3a1bef56576edbb4ba0bde6490808d18f52ca
+Subproject commit 31e80e78ea24044f570b1be5d5f71f3e207a17cd

bundle/neocomplcache

@@ -1 +1 @@
-Subproject commit 2a2cf14bc7d0bee7ac759970b17919d4ed076831
+Subproject commit 5c6f3cd9a713491e6b32752a05c45198aa91540a

bundle/nerdcommenter

@@ -1 +1 @@
-Subproject commit 7c4a90614792cf4b74e0f3386cc6b14046419312
+Subproject commit 3439f999b138254e4bb56187fc91f91f545b4b12

bundle/nerdtree

@@ -1 +1 @@
-Subproject commit a248fbf42571e4451755ff17df6ddd2be3863ca3
+Subproject commit 6efcfb275c8f7779bfc0738da730dfab19f157fe

bundle/phpcomplete.vim

@@ -1 +1 @@
-Subproject commit 772ab9587b7d1e2c3bae75395c9123803059ba8a
+Subproject commit e49d6c2459e0f5569ff2d533b4df995dd7f98313

bundle/python-mode

@@ -1 +1 @@
-Subproject commit cfd3b2d388a8c2e9903d7a9d80a65539aabfe933
+Subproject commit 4984767509e3d05ca051e253c8a8b37de784be45

bundle/syntastic

@@ -39,47 +39,65 @@ else
     set rtp+=$HOME/.vim/bundle/vundle/
 endif
 let g:vundle_default_git_proto = 'git'
-call vundle#rc()
+
+call vundle#rc('~/.vim/bundle')
 
 " let Vundle manage Vundle
 " required! 
 Plugin 'gmarik/vundle'
 "}}}
 " Plugins {{{
 
-Plugin 'xitianfz/custom_vimconf'
+" auto complete while searching in vim {{{
 Plugin 'SearchComplete'
-Plugin 'AutoTag'
+" }}}
+" auto tag for ctags, but seems that i have not installed ctags {{{
+" Plugin 'AutoTag'
+" }}}
+" magic usage with %, extended for html, xml or languages alike {{{
 Plugin 'matchit.zip'
-Plugin 'scrooloose/nerdcommenter'
+" let loaded_matchit = 1
+" }}}
+" quick change, delete surroundings: cs'",ds"  {{{
 Plugin 'tpope/vim-surround'
+" }}}
+" powerful status line {{{
 Plugin 'Lokaltog/vim-powerline'
+" beta vertion stil
+" Plugin 'powerline/powerline'
+" }}}
+" PHP {{{
 Plugin '2072/PHP-Indenting-for-VIm'
+Plugin 'shawncplus/phpcomplete.vim'
+"PDV--phpDocumentor-for-Vim
+Plugin 'PDV--phpDocumentor-for-Vim'
+noremap <leader>cd :call PhpDocSingle()<CR>
+" }}}
+" highlight nginx conf {{{
 Plugin 'vim-scripts/nginx.vim'
+" }}}
+" nice formater for json {{{
 Plugin 'elzr/vim-json'
+" }}}
+" coffee script {{{
 Plugin 'kchmck/vim-coffee-script'
+" }}}
+" c++ {{{
 Plugin 'octol/vim-cpp-enhanced-highlight'
-Plugin 'SyntaxAttr.vim'
-Plugin 'shawncplus/phpcomplete.vim'
-Plugin 'tpope/vim-unimpaired.git'
-Plugin 'Valloric/YouCompleteMe'
-Plugin 'The-NERD-Commenter'
-
+" }}}
+" Plugin 'SyntaxAttr.vim'
+" Plugin 'Valloric/YouCompleteMe'
+" useless {{{
+" Plugin 'tpope/vim-unimpaired.git'
+" }}}
 " Comment{{{
 Plugin 'tComment'
  nnoremap // :TComment<CR>
  vnoremap // :TComment<CR>
+ vnoremap /? :TCommentBlock<CR>
 " }}}
-"PDV--phpDocumentor-for-Vim{{{
-Plugin 'PDV--phpDocumentor-for-Vim'
-noremap <leader>cd :call PhpDocSingle()<CR>
-"}}}
-"Conque-Shell{{{
-Plugin 'Conque-Shell'
-noremap <F3> :ConqueTerm bash
-"}}}
 "kien/ctrlp.vim{{{
-Plugin 'kien/ctrlp.vim'
+Plugin 'ctrlpvim/ctrlp.vim'
 let g:ctrlp_working_path_mode = 0
 let g:ctrlp_follow_symlinks = 1
 let g:ctrlp_user_command = "find %s -type f \! \\( -path '*/.svn/*' -or -path '*/.git/*' -or -name '*.rrd' -or -name '*.pyc' -or -name '*.pyo' \\)"
@@ -91,23 +109,23 @@ colo molokai
 let g:molokai_original = 1
 "}}}
 "Shougo/neocomplcache{{{
-Plugin 'Shougo/neocomplcache'
-set completeopt-=preview
-let g:neocomplcache_enable_at_startup = 1
-let g:neocomplcache_enable_smart_case = 1
-let g:neocomplcache_enable_camel_case_completion = 1
-let g:neocomplcache_enable_underbar_completion = 1
-let g:neocomplcache_caching_limit_file_size = 50000000
-let g:neocomplcache_min_syntax_length = 2 
-"<CR>: close popup and save indent.
-inoremap <expr><CR>  neocomplcache#smart_close_popup() . "\<CR>"
-"<TAB>: completion. NO USE with snipmate
-inoremap <expr><TAB>  pumvisible() ? "\<C-n>" : "\<TAB>"
-"<C-h>, <BS>: close popup and delete backword char.
-inoremap <expr><C-h> neocomplcache#smart_close_popup()."\<C-h>"
-inoremap <expr><BS> neocomplcache#smart_close_popup()."\<C-h>"
-inoremap <expr><C-Y>  neocomplcache#close_popup()
-inoremap <expr><C-e>  neocomplcache#cancel_popup()
+" Plugin 'Shougo/neocomplete.vim'
+" set completeopt-=preview
+" let g:neocomplcache_enable_at_startup = 1
+" let g:neocomplcache_enable_smart_case = 1
+" let g:neocomplcache_enable_camel_case_completion = 1
+" let g:neocomplcache_enable_underbar_completion = 1
+" let g:neocomplcache_caching_limit_file_size = 50000000
+" let g:neocomplcache_min_syntax_length = 2 
+" "<CR>: close popup and save indent.
+" inoremap <expr><CR>  neocomplcache#smart_close_popup() . "\<CR>"
+" "<TAB>: completion. NO USE with snipmate
+" inoremap <expr><TAB>  pumvisible() ? "\<C-n>" : "\<TAB>"
+" "<C-h>, <BS>: close popup and delete backword char.
+" inoremap <expr><C-h> neocomplcache#smart_close_popup()."\<C-h>"
+" inoremap <expr><BS> neocomplcache#smart_close_popup()."\<C-h>"
+" inoremap <expr><C-Y>  neocomplcache#close_popup()
+" inoremap <expr><C-e>  neocomplcache#cancel_popup()
 "let g:neocomplcache_enable_auto_select = 1
 "}}}
 "scrooloose/nerdtree{{{
@@ -128,31 +146,41 @@ let g:syntastic_mode_map = { 'mode': 'active',
             \ 'passive_filetypes': ['python'] }
 "}}}
 "mattn/emmet-vim{{{
+" not working
 Plugin 'mattn/emmet-vim'
 let g:user_zen_settings = { 'lang': "zh-CN" }
 "}}}
-"taglist{{{
-Plugin 'taglist.vim'
-noremap <F3> :TlistToggle<cr>
+"taglist useless {{{
+" Plugin 'taglist.vim'
+" noremap <F3> :TlistToggle<cr>
 "}}}
-"tpope/vim-fugitive{{{
+"tpope/vim-fugitive  git things{{{
 Plugin 'tpope/vim-fugitive'
 noremap <leader>g :Gstatus<cr><c-w>_
 "}}}
 "Lokaltog/vim-easymotion"{{{
 Plugin 'Lokaltog/vim-easymotion'
+" let g:user_emmet_leader_key='<C-Z>'
 let g:EasyMotion_leader_key = ';'
 "}}}
-"klen/python-mode"{{{
+"klen/python-mode" bri {{{
 Plugin 'klen/python-mode'
+let g:pymode_rope_goto_definition_bind = "<C-]>"
 let g:pymode_rope_complete_on_dot = 0
 let g:pymode_rope_goto_definition_cmd = 'e'
 let g:pymode_lint_cwindow = 0
 let g:pymode_lint_ignore = "C901"
+let g:pymode_run_bind = '<leader>r'
+" highlight ColorColumn ctermbg=235 guibg=#2c2d27
 "}}}
 "fatih/vim-go"{{{
 Plugin 'fatih/vim-go'
+" let g:go_fmt_command = "goimports"
 let g:go_fmt_autosave = 0
+let g:go_fmt_fail_silently = 0
+let g:syntastic_go_checkers = ['golint', 'govet', 'errcheck']
+let g:syntastic_mode_map = { 'mode': 'active', 'passive_filetypes': ['go'] }
+let g:go_list_type = "quickfix"
 "}}}
 Plugin 'nsf/gocode', {'rtp': 'vim/'}
 "}}}
@@ -459,7 +487,7 @@ au BufNewFile,BufRead *.jinja set syntax=htmljinja
 au BufNewFile,BufRead *.mako set ft=mako
 
 au FileType python highlight OverLength ctermbg=red ctermfg=white guibg=#592929
-" au FileType python match OverLength /\%80v.\+/
+au FileType python highlight ColorColumn ctermbg=235 guibg=#2c2d27
 
 """"""""""""""""""""""""""""""
 " => C section
@@ -496,6 +524,7 @@ au FileType go nmap <leader>c <Plug>(go-coverage)
 au FileType go nmap <leader>r <Plug>(go-run)
 au FileType go nmap <leader>b <Plug>(go-build)
 au FileType go nmap <Leader>s <Plug>(go-implements)
+au FileType go nmap <leader>] <Plug>(go-def-vertical)
 au FileType go nmap <F12>     :GoFmt <CR>
 
 set foldmethod=syntax   "fold based on indent
@@ -510,6 +539,11 @@ autocmd BufWinEnter *.* silent loadview
 """""""""""""""""""""""""""""""
 au BufNewFile,BufRead *.as set filetype=actionscript
 
+""""""""""""""""""""""""""""""
+" => nginx section
+"""""""""""""""""""""""""""""""
+au BufRead,BufNewFile /etc/nginx/*,/usr/local/nginx/conf/* if &ft == '' | setfiletype nginx | endif 
+
 """"""""""""""""""""""""""""""
 " => Vim grep
 """"""""""""""""""""""""""""""