commit 9e8b2a4841abc4a6a100a73b86b4176eb4f40a3d parent 146b4ea544234dec9b0fe657d066289741fb4dd1 Author: Xiaodong Xu <[email protected]> Date: Tue Feb 21 15:55:33 +0800 Update config Diffstat:
diff --git a/.gitmodules b/.gitmodules @@ -232,3 +232,24 @@ [submodule "_vim/bundle/matchit"] path = _vim/bundle/matchit url = git://github.com/jwhitley/vim-matchit.git +[submodule "_vim/bundle/conoline"] + path = _vim/bundle/conoline + url = git://github.com/miyakogi/conoline.vim.git +[submodule "_vim/bundle/limelight"] + path = _vim/bundle/limelight + url = git://github.com/junegunn/limelight.vim.git +[submodule "_vim/bundle/gundo"] + path = _vim/bundle/gundo + url = git://github.com/sjl/gundo.vim.git +[submodule "_vim/bundle/targets"] + path = _vim/bundle/targets + url = git://github.com/wellle/targets.vim.git +[submodule "_vim/bundle/neomake"] + path = _vim/bundle/neomake + url = git://github.com/neomake/neomake.git +[submodule "_vim/bundle/editorconfig"] + path = _vim/bundle/editorconfig + url = git://github.com/editorconfig/editorconfig-vim.git +[submodule "_vim/bundle/ale"] + path = _vim/bundle/ale + url = git://github.com/w0rp/ale.git diff --git a/_vim/bundle/ags b/_vim/bundle/ags @@ -1 +1 @@ -Subproject commit 182c472d561c4ebe35820e54c77bd6cb3e20d8d4 +Subproject commit c3a445dd37ec91ff14c0d7fac175665b6204005d diff --git a/_vim/bundle/airline b/_vim/bundle/airline @@ -1 +1 @@ -Subproject commit 258430db82329c1298750af91391c1b21a5a5b58 +Subproject commit a2431f2adb23a003abdfe5294861bbd69de52e52 diff --git a/_vim/bundle/airline-themes b/_vim/bundle/airline-themes @@ -1 +1 @@ -Subproject commit e03e9f62d25f9afb04c88ec6ca66cf2098242016 +Subproject commit 2a97d9ee410d7b9980a7741fc6e705d53eea23c2 diff --git a/_vim/bundle/ale b/_vim/bundle/ale @@ -0,0 +1 @@ +Subproject commit d953c68ebbbb2cd28c2985394ccf16af903bb78d diff --git a/_vim/bundle/base16 b/_vim/bundle/base16 @@ -1 +1 @@ -Subproject commit 0c48348a18bad52f9275d56b4adffa665a280322 +Subproject commit de0afc260840304719856b257c007d8d0df32655 diff --git a/_vim/bundle/codi b/_vim/bundle/codi @@ -1 +1 @@ -Subproject commit 6f83309975a8936b1ed119f2d6bb4102982a8b57 +Subproject commit 3cfa8204c34d52d6582ef50d748645eb778344df diff --git a/_vim/bundle/conoline b/_vim/bundle/conoline @@ -0,0 +1 @@ +Subproject commit 95b6f03d026033e22e89525e4fcc7af30ea339a1 diff --git a/_vim/bundle/deoplete-jedi b/_vim/bundle/deoplete-jedi @@ -1 +1 @@ -Subproject commit 57e5b61578d4d0a27fa75fd5f8dc21d110d60989 +Subproject commit cdbe0902d646c37e68d0b2967b445c993b78cd32 diff --git a/_vim/bundle/deoplete.nvim b/_vim/bundle/deoplete.nvim @@ -1 +1 @@ -Subproject commit 5fc5ed772de138439322d728b103a7cb225cbf82 +Subproject commit 6e529ab220f98a35c8c10911dbeca7597011c04a diff --git a/_vim/bundle/easymotion b/_vim/bundle/easymotion @@ -1 +1 @@ -Subproject commit 11632455de8caa40f264501df8f0a3e249cf0595 +Subproject commit af9786ee5780bf0cbafbd7b341c2b5234d18c1c0 diff --git a/_vim/bundle/editorconfig b/_vim/bundle/editorconfig @@ -0,0 +1 @@ +Subproject commit a459b8cfef00100da40fd69c8ae92c4d1e63e1d2 diff --git a/_vim/bundle/emmet b/_vim/bundle/emmet @@ -1 +1 @@ -Subproject commit d7b70c656a54ff9fcf9697f98d8d45d2368c4072 +Subproject commit 5442207ccb4468ee511a3ae5aa4d81839b247d24 diff --git a/_vim/bundle/fugitive b/_vim/bundle/fugitive @@ -1 +1 @@ -Subproject commit 58ed86e434951319ff7d438fb1096f24a51e6458 +Subproject commit b754bc2031f21a532c083dd0d072ba373bbe3a37 diff --git a/_vim/bundle/gitgutter b/_vim/bundle/gitgutter @@ -1 +1 @@ -Subproject commit 1742a8f568df549f4daeda90174b54d0c371501f +Subproject commit 77aa7ea225b41f0121719fcc166cc9087f39f78e diff --git a/_vim/bundle/gitv b/_vim/bundle/gitv @@ -1 +1 @@ -Subproject commit 16904714a3d883396bd95e4487c3b1000f7118d1 +Subproject commit fba7eee30b6a4e52e04efc1258f64352db1810b3 diff --git a/_vim/bundle/goyo b/_vim/bundle/goyo @@ -1 +1 @@ -Subproject commit 8e8f1d45b61e1fce7f84ee061c38f9e033e86ff9 +Subproject commit ebdd67fd6160b7f95ac8fe50b382694c9961d6b8 diff --git a/_vim/bundle/gundo b/_vim/bundle/gundo @@ -0,0 +1 @@ +Subproject commit b4f3624d01ffdfd7bdcd2e19128fffe768fe6262 diff --git a/_vim/bundle/incsearch b/_vim/bundle/incsearch @@ -1 +1 @@ -Subproject commit 161c5b66542e767962ca5f6998a22e984f8d8a60 +Subproject commit 213994fb3d75a30d3c1f8b965910f662d11cb1fd diff --git a/_vim/bundle/indentline b/_vim/bundle/indentline @@ -1 +1 @@ -Subproject commit 86b9824b89cf52d4b748ea2a27885607c98c881a +Subproject commit 942fea03e62695108a303c5c08644d02ca1a90e5 diff --git a/_vim/bundle/jellybeans b/_vim/bundle/jellybeans @@ -1 +1 @@ -Subproject commit fd089ca8a242263f61ae7bddce55a007d535bc65 +Subproject commit fdc7b7ecd714c9afb0a5872ae87db0b23d50ea30 diff --git a/_vim/bundle/limelight b/_vim/bundle/limelight @@ -0,0 +1 @@ +Subproject commit 106fb5749d227a0de72e36068ed72798c6fd48e6 diff --git a/_vim/bundle/matchtag b/_vim/bundle/matchtag @@ -1 +1 @@ -Subproject commit d57b62f22d60f18b3bad0c5abc8c4bc99d35c5e5 +Subproject commit 38250f4560f78a45f9fa0772faaba35894aa90bd diff --git a/_vim/bundle/neomake b/_vim/bundle/neomake @@ -0,0 +1 @@ +Subproject commit 257e76f75445c8fafb960b0c6f9b45d56aa17196 diff --git a/_vim/bundle/neoman b/_vim/bundle/neoman @@ -1 +1 @@ -Subproject commit 75d6d576f1c49fe77ba66a88325cf10c35b2f2ee +Subproject commit 522f6740b71c733cec510d3dae8f71ac367aaef6 diff --git a/_vim/bundle/nerdcommenter b/_vim/bundle/nerdcommenter @@ -1 +1 @@ -Subproject commit 97cb982f1f0d0631b34b71b065e162916bee4036 +Subproject commit 18cfe815501c8264844223a944eb388285b48caa diff --git a/_vim/bundle/nerdtree b/_vim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit eee431dbd44111c858c6d33ffd366cae1f17f8b3 +Subproject commit 281701021c5001332a862da80175bf585d24e2e8 diff --git a/_vim/bundle/robotframework b/_vim/bundle/robotframework @@ -1 +1 @@ -Subproject commit 26579d407641a7e5f964ca136f9d4f8e67813f67 +Subproject commit 65dff847595954edbc6bab9f93bb443e86d31da4 diff --git a/_vim/bundle/ruby b/_vim/bundle/ruby @@ -1 +1 @@ -Subproject commit e865f7cacf05908668ed07be2db553f4fb4d56fd +Subproject commit 53c77ead60140df436c11d86aef5e1a4ef0eba94 diff --git a/_vim/bundle/signature b/_vim/bundle/signature @@ -1 +1 @@ -Subproject commit f1f7108aacac5dc3a7e3b697c489f8271fa054b8 +Subproject commit 7e13913188809c45e14988270213744d1c3bb485 diff --git a/_vim/bundle/slime b/_vim/bundle/slime @@ -1 +1 @@ -Subproject commit c613944dd0cb1ef0a01e2735350ce3151631b901 +Subproject commit d8008b643119d05b873868c7312b438fa44d1918 diff --git a/_vim/bundle/sneak b/_vim/bundle/sneak @@ -1 +1 @@ -Subproject commit ecbc1faab454c90812275948121535d1049e6ea1 +Subproject commit 311b905e4da3fdaeb12aae51229742f3a789a334 diff --git a/_vim/bundle/snipmate b/_vim/bundle/snipmate @@ -1 +1 @@ -Subproject commit 31986191ac9923afcd53bf6425c9b6c35fdbb214 +Subproject commit 2d70860ba49afc83cb5902acb99174e3cf08538d diff --git a/_vim/bundle/snippets b/_vim/bundle/snippets @@ -1 +1 @@ -Subproject commit 91db3d3dc11e871386f08c200ea084d590bda741 +Subproject commit 8f5a51ac2581a4b81e5be79f9c330fa204a3759a diff --git a/_vim/bundle/splitjoin b/_vim/bundle/splitjoin @@ -1 +1 @@ -Subproject commit cd98e308f71ebf38fd797a379706901cf5e6818c +Subproject commit 85f2b696cd4646ac31895f07093a3a0b87af456c diff --git a/_vim/bundle/startify b/_vim/bundle/startify @@ -1 +1 @@ -Subproject commit 9732427469c6933cbedeb7e662c70a2aaf4e63d2 +Subproject commit b8da06ad2cf4e57a49ac6ae72e77d9a523dc0e8e diff --git a/_vim/bundle/syntastic b/_vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit 734fde7f0b84ff3f670ab5772ed1b8b0c8c16770 +Subproject commit b03f26d049c31c9ae341a94f4f3c680fecd9eda5 diff --git a/_vim/bundle/tagbar b/_vim/bundle/tagbar @@ -1 +1 @@ -Subproject commit e212be6a12250d66a118985f316c1dcf93f00681 +Subproject commit 53e9cb030e143b6286ed06255fef018265edd311 diff --git a/_vim/bundle/targets b/_vim/bundle/targets @@ -0,0 +1 @@ +Subproject commit c12d4ea9e5032c9e5b88e2115a80b8772d15d0df diff --git a/_vim/bundle/tomorrow b/_vim/bundle/tomorrow @@ -1 +1 @@ -Subproject commit f45a2ca260d825b6aee72621f8f6158d815ac472 +Subproject commit 46994f3a4d4574ce0d48c26a3bc1e528b8092c93 diff --git a/_vim/bundle/ultisnips b/_vim/bundle/ultisnips @@ -1 +1 @@ -Subproject commit 71c39721de9cb2d67478e8b8c1a543e006fb67df +Subproject commit f974e0317f549c7cf54fa231ee0501206aed6882 diff --git a/_vim/bundle/unite b/_vim/bundle/unite @@ -1 +1 @@ -Subproject commit f3f6df24c04faf29ae4d716aa776f85e88e7ea38 +Subproject commit be09b0e5784c4c4c13aefae4f16313696c6f51de diff --git a/_vim/bundle/vimfiler b/_vim/bundle/vimfiler @@ -1 +1 @@ -Subproject commit 1f00a8a5c48714ae88e7a573429beef447003a5d +Subproject commit 72c37e897d09a8749417a3322a25ee45aa3a4ed3 diff --git a/_vim/conf/base.vim b/_vim/conf/base.vim @@ -1,6 +1,6 @@ " " author: Xu Xiaodong <[email protected]> -" modified: 2016 May 14 +" modified: 2016 Dec 06 " "-- base --" @@ -22,3 +22,7 @@ nmap _h :call _set_sh_header()<cr> " auto update timestamps autocmd BufWritePre * call _last_modified() + +" python +let g:python_host_prog='/usr/bin/python2' +let g:python3_host_prog='/usr/bin/python3' diff --git a/_vim/conf/funcs.vim b/_vim/conf/funcs.vim @@ -1,6 +1,6 @@ " " author : Xu Xiaodong <[email protected]> -" modified : 2016 May 14 +" modified : 2016 Dec 04 " "-- update timestamps --" @@ -97,7 +97,7 @@ function! _set_sh_header() endif exe "normal o# name : " . filename exe "normal o# author : Xu Xiaodong <[email protected]>" - exe "normal o# license : GPL" + exe "normal o# license : GPLv3" exe "normal o# created : " . date exe "normal o# modified : " . date exe "normal o#" diff --git a/_vim/conf/perl.vim b/_vim/conf/perl.vim @@ -1,6 +1,6 @@ " " author: Xu Xiaodong <[email protected]> -" modified: 2011 May 08 +" modified: 2016 Dec 04 " "-- perl --" @@ -9,7 +9,7 @@ let perl_include_pod=1 let perl_extended_vars=1 let perl_sync_dist=250 -nmap <leader>p :call _perl_head()<cr> +nmap <leader>p :call _set_sh_header()<cr> nmap <leader>us :<c-u>call _perl_use()<cr> " comment @@ -30,7 +30,7 @@ autocmd FileType perl set autowrite autocmd FileType perl :nmap K :!perldoc <cword> <bar><bar> perldoc -f <cword><cr> " perl file header -autocmd BufNewFile *.pl call _perl_head() +autocmd BufNewFile *.pl call _set_sh_header() " compile check autocmd! FileType perl :nmap <leader>c :!time perl -MVi::QuickFix -c %<cr> diff --git a/_vim/conf/plugin.vim b/_vim/conf/plugin.vim @@ -1,6 +1,6 @@ " " author : Xu Xiaodong <[email protected]> -" modified : 2016 Sep 21 +" modified : 2016 Nov 13 " "-- plugin --" @@ -24,11 +24,11 @@ endif let g:airline_symbols.maxlinenr='' let g:airline_symbols.notexists='' let g:airline_symbols.whitespace='' -"let g:airline_section_y='' +let g:airline_section_y='' "let g:airline_section_z='' -"let g:airline_section_error='' -"let g:airline_section_warning='' -let g:airline#extensions#tabline#enabled = 1 +let g:airline_section_error='' +let g:airline_section_warning='' +"let g:airline#extensions#tabline#enabled = 1 " nerdtree let g:NERDTreeWinSize=25 @@ -136,5 +136,8 @@ let g:deoplete#enable_at_startup = 1 let g:deoplete#disable_auto_complete = 1 " indentlines -let g:indentLine_char = '┆' -let g:indentLine_enabled = 0 +let g:indentLine_char = '│' +let g:indentLine_enabled = 1 + +" gruvbox +let g:gruvbox_contrast_dark = 'medium' diff --git a/_vimrc b/_vimrc @@ -1,6 +1,6 @@ " " author: Xu Xiaodong <[email protected]> -" modified: 2016 Jun 27 +" modified: 2016 Dec 06 " "-- source --" @@ -21,6 +21,7 @@ set relativenumber set ruler set cursorline set wildmenu +set lazyredraw set splitbelow set history=500 @@ -71,6 +72,8 @@ set copyindent set foldenable set foldmethod=marker +set foldlevelstart=10 +set foldnestmax=10 set backspace=indent,eol,start set iskeyword+=: @@ -89,6 +92,7 @@ set incsearch set hlsearch set gdefault set showmatch +set inccommand=nosplit set grepprg=ack set grepformat=%f:%l:%m @@ -140,6 +144,9 @@ map <space> / map <m-space> ? nmap <silent> <leader>/ :nohlsearch<cr> +" highlight last inserted text +nnoremap gV `[v`] + " paste mode set pastetoggle=<f2>