commit 05e662c7846b845d68cb3bbfdce850099cac9291 parent d19ba6dddd0b8de74f52fce30eb030c17c9cca71 Author: Xiaodong Xu <[email protected]> Date: Tue Jul 12 08:29:04 +0800 Add plugins Diffstat:
diff --git a/.gitignore b/.gitignore @@ -1 +1,3 @@ _vim/bundle/vim-tn +.update-timestamp +_vim/.init.vim-rplugin~ diff --git a/.gitmodules b/.gitmodules @@ -157,3 +157,66 @@ [submodule "_vim/bundle/easy-align"] path = _vim/bundle/easy-align url = git://github.com/junegunn/vim-easy-align.git +[submodule "_vim/bundle/easymotion"] + path = _vim/bundle/easymotion + url = git://github.com/easymotion/vim-easymotion.git +[submodule "_vim/bundle/sneak"] + path = _vim/bundle/sneak + url = git://github.com/justinmk/vim-sneak.git +[submodule "_vim/bundle/indent-guides"] + path = _vim/bundle/indent-guides + url = git://github.com/nathanaelkane/vim-indent-guides.git +[submodule "_vim/bundle/indentline"] + path = _vim/bundle/indentline + url = git://github.com/Yggdroot/indentLine.git +[submodule "_vim/bundle/rainbow_parentheses"] + path = _vim/bundle/rainbow_parentheses + url = git://github.com/kien/rainbow_parentheses.vim.git +[submodule "_vim/bundle/signature"] + path = _vim/bundle/signature + url = git://github.com/kshenoy/vim-signature.git +[submodule "_vim/bundle/startify"] + path = _vim/bundle/startify + url = git://github.com/mhinz/vim-startify.git +[submodule "_vim/bundle/extradite"] + path = _vim/bundle/extradite + url = git://github.com/int3/vim-extradite.git +[submodule "_vim/bundle/snipmate"] + path = _vim/bundle/snipmate + url = git://github.com/garbas/vim-snipmate.git +[submodule "_vim/bundle/tlib_vim"] + path = _vim/bundle/tlib_vim + url = git://github.com/tomtom/tlib_vim.git +[submodule "_vim/bundle/addon-mw-utils"] + path = _vim/bundle/addon-mw-utils + url = git://github.com/MarcWeber/vim-addon-mw-utils.git +[submodule "_vim/bundle/snippets"] + path = _vim/bundle/snippets + url = git://github.com/honza/vim-snippets.git +[submodule "_vim/bundle/zeavim"] + path = _vim/bundle/zeavim + url = git://github.com/KabbAmine/zeavim.vim.git +[submodule "_vim/bundle/dasht"] + path = _vim/bundle/dasht + url = git://github.com/sunaku/vim-dasht.git +[submodule "_vim/bundle/deoplete.nvim"] + path = _vim/bundle/deoplete.nvim + url = git://github.com/Shougo/deoplete.nvim.git +[submodule "_vim/bundle/neoman"] + path = _vim/bundle/neoman + url = git://github.com/nhooyr/neoman.vim.git +[submodule "_vim/bundle/deoplete-jedi"] + path = _vim/bundle/deoplete-jedi + url = git://github.com/zchee/deoplete-jedi.git +[submodule "_vim/bundle/vinegar"] + path = _vim/bundle/vinegar + url = git://github.com/tpope/vim-vinegar.git +[submodule "_vim/bundle/vimfiler"] + path = _vim/bundle/vimfiler + url = git://github.com/Shougo/vimfiler.vim.git +[submodule "_vim/bundle/ags"] + path = _vim/bundle/ags + url = git://github.com/gabesoft/vim-ags.git +[submodule "_vim/bundle/goyo"] + path = _vim/bundle/goyo + url = git://github.com/junegunn/goyo.vim.git diff --git a/_vim/bundle/addon-mw-utils b/_vim/bundle/addon-mw-utils @@ -0,0 +1 @@ +Subproject commit 0c5612fa31ee434ba055e21c76f456244b3b5109 diff --git a/_vim/bundle/ags b/_vim/bundle/ags @@ -0,0 +1 @@ +Subproject commit 182c472d561c4ebe35820e54c77bd6cb3e20d8d4 diff --git a/_vim/bundle/airline b/_vim/bundle/airline @@ -1 +1 @@ -Subproject commit 7b9b68f15dc50ef3c6382bd9df3a5e70c9ddcee9 +Subproject commit 4d0c4f6b1e3fee30873b0c9734fbe83f4d74b81c diff --git a/_vim/bundle/airline-themes b/_vim/bundle/airline-themes @@ -1 +1 @@ -Subproject commit 796478723c01a275269b96f63ee5cd5b44a342f4 +Subproject commit aa95f935047323dbcbe2fed210bd3a0356a3c32b diff --git a/_vim/bundle/base16 b/_vim/bundle/base16 @@ -1 +1 @@ -Subproject commit e711e9b1412b55fec7e8a5cff4ac5c06f9078729 +Subproject commit 6e46bccea5b24a5e862bc4ef183592b3a0e4da71 diff --git a/_vim/bundle/dasht b/_vim/bundle/dasht @@ -0,0 +1 @@ +Subproject commit 43c5cab9848f506e1cfade23023d639b9f330749 diff --git a/_vim/bundle/deoplete-jedi b/_vim/bundle/deoplete-jedi @@ -0,0 +1 @@ +Subproject commit e7f0a94ea64b86d2b4946d30b6cedb38133d6603 diff --git a/_vim/bundle/deoplete.nvim b/_vim/bundle/deoplete.nvim @@ -0,0 +1 @@ +Subproject commit 8102bbb73f942b232b6bcc00b8699fbe3b3f370c diff --git a/_vim/bundle/easymotion b/_vim/bundle/easymotion @@ -0,0 +1 @@ +Subproject commit 5c6f3cd9a713491e6b32752a05c45198aa91540a diff --git a/_vim/bundle/emmet b/_vim/bundle/emmet @@ -1 +1 @@ -Subproject commit 52f3af7ca8bc6a9988fcd80c7189591330fbcadd +Subproject commit 3654efd3d18d73d654be7de45a892911c295b08b diff --git a/_vim/bundle/extradite b/_vim/bundle/extradite @@ -0,0 +1 @@ +Subproject commit 52326f6d333cdbb9e9c6d6772af87f4f39c00526 diff --git a/_vim/bundle/fugitive b/_vim/bundle/fugitive @@ -1 +1 @@ -Subproject commit 3439f999b138254e4bb56187fc91f91f545b4b12 +Subproject commit c00ebd75ac23f4080c0d0bf9453b16304a3fb316 diff --git a/_vim/bundle/gitgutter b/_vim/bundle/gitgutter @@ -1 +1 @@ -Subproject commit 09b9144002e938844df74f48ac72c1e3118e7d39 +Subproject commit b5f23e986747a6f4b1dc1196d2a5bd3dc7c8c2b6 diff --git a/_vim/bundle/goyo b/_vim/bundle/goyo @@ -0,0 +1 @@ +Subproject commit 8e8f1d45b61e1fce7f84ee061c38f9e033e86ff9 diff --git a/_vim/bundle/hicterm b/_vim/bundle/hicterm @@ -1 +1 @@ -Subproject commit f0e8ea9414fcbc6f160df40fcff0bf344751ce81 +Subproject commit bdd4a5785189716254f6b0d1980dd05c1be3cee6 diff --git a/_vim/bundle/indent-guides b/_vim/bundle/indent-guides @@ -0,0 +1 @@ +Subproject commit 018298ead9d3aa9cd3b4ae222f81022a33978b09 diff --git a/_vim/bundle/indentline b/_vim/bundle/indentline @@ -0,0 +1 @@ +Subproject commit 2a2617310b0fb4c0daf02be2ba465fada257f2d0 diff --git a/_vim/bundle/neoman b/_vim/bundle/neoman @@ -0,0 +1 @@ +Subproject commit 2eb6205397a63d14fd44e9d0f035a0b256f8fe23 diff --git a/_vim/bundle/nerdtree b/_vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit d280b15ba9388ab93f3401b26877a13fdb8ed816 +Subproject commit 2e2b649232d6ae4d02d74793e5da0ee08480ad8d diff --git a/_vim/bundle/rainbow_parentheses b/_vim/bundle/rainbow_parentheses @@ -0,0 +1 @@ +Subproject commit eb8baa5428bde10ecc1cb14eed1d6e16f5f24695 diff --git a/_vim/bundle/ruby b/_vim/bundle/ruby @@ -1 +1 @@ -Subproject commit 97bc93301057b4ea27ae93c6d5c9749f77ca702b +Subproject commit e667558961206e152764625383d661e1e21e8e46 diff --git a/_vim/bundle/signature b/_vim/bundle/signature @@ -0,0 +1 @@ +Subproject commit e2fca5f3b0474e7174e08b32c89634ac6f53bfe2 diff --git a/_vim/bundle/slime b/_vim/bundle/slime @@ -1 +1 @@ -Subproject commit 6dc7e45e3effe3926243914f5cbe3faab21b6657 +Subproject commit bd57c785b9725d61bb26d49cbec3aef2edcfad27 diff --git a/_vim/bundle/sneak b/_vim/bundle/sneak @@ -0,0 +1 @@ +Subproject commit 8f7fe76ae5de6cb04250a0d4fab82735121ca527 diff --git a/_vim/bundle/snipmate b/_vim/bundle/snipmate @@ -0,0 +1 @@ +Subproject commit ee433e43c76c768c95ad6d9af67c4cd4b40f7eac diff --git a/_vim/bundle/snippets b/_vim/bundle/snippets @@ -0,0 +1 @@ +Subproject commit d285c86221e917d13c6cbf89f347627ea9fe1796 diff --git a/_vim/bundle/splitjoin b/_vim/bundle/splitjoin @@ -1 +1 @@ -Subproject commit a206dbaddef39ac06aee880fbb7a7256bce92899 +Subproject commit a6f9ddcfb58f13fdefb656eb67e5d39616c4148a diff --git a/_vim/bundle/startify b/_vim/bundle/startify @@ -0,0 +1 @@ +Subproject commit 84a296eb5c36dc263ab67db3202e57fa783473b0 diff --git a/_vim/bundle/syntastic b/_vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit d6b96c079be137c83009827b543a83aa113cc011 +Subproject commit 9bec49b7f95f02d1e0e51813b471065fa021ceef diff --git a/_vim/bundle/tlib_vim b/_vim/bundle/tlib_vim @@ -0,0 +1 @@ +Subproject commit 5636472e5dba1a4104376ce6bd93cc2546e02483 diff --git a/_vim/bundle/ultisnips b/_vim/bundle/ultisnips @@ -1 +1 @@ -Subproject commit 1c6b4f75a006c4411d01a1234cabda3eb4aded1a +Subproject commit e8c485eb3c7e2c4c3ddc62beb79011f026a3ca04 diff --git a/_vim/bundle/unite b/_vim/bundle/unite @@ -1 +1 @@ -Subproject commit a7001971de262bdd5cfaf01c89985866ea71bb6e +Subproject commit faeff916c6af683990d3afe571047ebdb8bf2a4b diff --git a/_vim/bundle/vimfiler b/_vim/bundle/vimfiler @@ -0,0 +1 @@ +Subproject commit 7216090936e16e1c3449d60d384de6a4858df533 diff --git a/_vim/bundle/vinegar b/_vim/bundle/vinegar @@ -0,0 +1 @@ +Subproject commit bd7f7b7929260072864462c04dde3b9f4c5e0d23 diff --git a/_vim/bundle/zeavim b/_vim/bundle/zeavim @@ -0,0 +1 @@ +Subproject commit 5a23f5cc8f2345326aa11481134b35c5f5539f0b diff --git a/_vim/conf/plugin.vim b/_vim/conf/plugin.vim @@ -1,6 +1,6 @@ " " author : Xu Xiaodong <[email protected]> -" modified : 2016 Jun 15 +" modified : 2016 Jun 28 " "-- plugin --" @@ -17,7 +17,7 @@ vmap <silent> <leader>i( <esc>:AlignPush<cr>:AlignCtrl lp0P0<cr>:'<,'>Align (<cr " airline let g:airline_powerline_fonts=1 -let g:airline_theme='tomorrow' +let g:airline_theme='gruvbox' if !exists('g:airline_symbols') let g:airline_symbols={} endif @@ -26,6 +26,7 @@ let g:airline_symbols.maxlinenr='' "let g:airline_section_z='' "let g:airline_section_error='' "let g:airline_section_warning='' +let g:airline#extensions#tabline#enabled = 1 " nerdtree let g:NERDTreeWinSize=25 @@ -91,3 +92,47 @@ map g/ <Plug>(incsearch-stay) " easy-align xmap ga <Plug>(EasyAlign) nmap ga <Plug>(EasyAlign) + +" rainbow_parentheses +let g:rbpt_colorpairs = [ + \ ['brown', 'RoyalBlue3'], + \ ['Darkblue', 'SeaGreen3'], + \ ['darkgray', 'DarkOrchid3'], + \ ['darkgreen', 'firebrick3'], + \ ['darkcyan', 'RoyalBlue3'], + \ ['darkred', 'SeaGreen3'], + \ ['darkmagenta', 'DarkOrchid3'], + \ ['brown', 'firebrick3'], + \ ['gray', 'RoyalBlue3'], + \ ['black', 'SeaGreen3'], + \ ['darkmagenta', 'DarkOrchid3'], + \ ['Darkblue', 'firebrick3'], + \ ['darkgreen', 'RoyalBlue3'], + \ ['darkcyan', 'SeaGreen3'], + \ ['darkred', 'DarkOrchid3'], + \ ['red', 'firebrick3'], + \ ] +let g:rbpt_max = 16 +let g:rbpt_loadcmd_toggle = 0 +au VimEnter * RainbowParenthesesToggle +au Syntax * RainbowParenthesesLoadRound +au Syntax * RainbowParenthesesLoadSquare +au Syntax * RainbowParenthesesLoadBraces + +" dasht +" Search API docs for query you type in: +nnoremap <Leader>k :Dasht<Space> + +" Search API docs for word under cursor: +nnoremap <silent> <Leader>K :call Dasht([expand('<cWORD>'), expand('<cword>')])<Return> + +" Search API docs for the selected text: +vnoremap <silent> <Leader>K y:<C-U>call Dasht(getreg(0))<Return> + +" deoplete +let g:deoplete#enable_at_startup = 1 +let g:deoplete#disable_auto_complete = 1 + +" indentlines +let g:indentLine_char = '┆' +let g:indentLine_enabled = 0 diff --git a/_vim/init.vim b/_vim/init.vim @@ -0,0 +1 @@ +/home/xiaodong/.vimrc+ \ No newline at end of file diff --git a/_vimrc b/_vimrc @@ -1,6 +1,6 @@ " " author: Xu Xiaodong <[email protected]> -" modified: 2016 May 15 +" modified: 2016 Jun 27 " "-- source --" @@ -40,7 +40,7 @@ if &t_Co < 256 colorscheme miro8 else set background=dark - colorscheme Tomorrow-Night + colorscheme gruvbox endif "-- file --" @@ -154,5 +154,9 @@ nmap <leader>m mmHmt:%s/<C-V><cr>//ge<cr>'tzt'm "-- other --" +" c +autocmd BufRead,BufNewFile *.h set filetype=c +autocmd FileType c setlocal expandtab tabstop=8 shiftwidth=8 softtabstop=8 + " reload .vimrc autocmd! BufWritePost vimrc source ~/.vimrc