X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/45ae13e4b54571a2a01b78d9a2efa4727b5886fe..e4909dcfac178f4fe1be1176599814396084989b:/vim/vimrc?ds=inline
diff --git a/vim/vimrc b/vim/vimrc
index 2cdb19d..6884590 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -20,15 +20,17 @@ Plugin 'derekwyatt/vim-fswitch'
Plugin 'elzr/vim-json'
Plugin 'firef0x/pkgbuild.vim'
Plugin 'junegunn/vim-easy-align'
-Plugin 'kien/ctrlp.vim'
+" Plugin 'kien/ctrlp.vim'
" Plugin 'klen/python-mode'
Plugin 'wilywampa/python-mode'
Plugin 'kshenoy/vim-signature'
Plugin 'majutsushi/tagbar'
Plugin 'raimondi/delimitmate'
-Plugin 'rking/ag.vim'
+" Plugin 'rking/ag.vim'
Plugin 'scrooloose/nerdtree'
Plugin 'scrooloose/syntastic'
+Plugin 'shougo/vimproc.vim'
+Plugin 'shougo/unite.vim'
Plugin 'sjl/gundo.vim'
Plugin 'tomtom/tcomment_vim'
Plugin 'tpope/vim-endwise'
@@ -43,6 +45,11 @@ Plugin 'vim-scripts/yankring.vim'
Plugin 'sirver/ultisnips'
Plugin 'honza/vim-snippets'
+" text objects
+Plugin 'kana/vim-textobj-user'
+Plugin 'julian/vim-textobj-variable-segment'
+Plugin 'sgur/vim-textobj-parameter'
+
" ros
Plugin 'ompugao/ros.vim'
Plugin 'ompugao/ctrlp-ros'
@@ -51,7 +58,7 @@ Plugin 'ompugao/ctrlp-ros'
" Plugin 'jalcine/cmake.vim'
" Plugin 'powerman/vim-plugin-viewdoc'
-" find an alternative
+" find an alternative (latex-box? Automatic Latex Plugin?)
Plugin 'http://git.code.sf.net/p/vim-latex/vim-latex'
" Plugin 'lokaltog/vim-easymotion'
Plugin 'justinmk/vim-sneak'
@@ -59,10 +66,6 @@ Plugin 'chrisbra/checkattach'
Plugin 'nathanaelkane/vim-indent-guides'
Plugin 'alx741/vinfo'
-Plugin 'kana/vim-textobj-user'
-Plugin 'julian/vim-textobj-variable-segment'
-Plugin 'sgur/vim-textobj-parameter'
-
" remove entries first
set runtimepath -=$HOME/.vim
set runtimepath -=$HOME/.vim/after
@@ -97,7 +100,7 @@ set showbreak=⪠" show these chars for wrapped lines
set lazyredraw " don't redraw while executing macros
set list " show chars defined in 'listchars'
-set listchars=tab:â¸\ " list of strings used for list mode
+set listchars=tab:â\ " list of strings used for list mode
set listchars+=extends:â¯,precedes:â®
" Only shown when not in insert mode
augroup trailing
@@ -378,10 +381,13 @@ map Q gq
" break undo sequence before removing word
inoremap <C-W> <C-G>u<C-W>
-nmap <Leader>b :set expandtab tabstop=4 shiftwidth=4 softtabstop=4<CR>
-nmap <Leader>B :set expandtab tabstop=8 shiftwidth=8 softtabstop=4<CR>
-nmap <Leader>M :set noexpandtab tabstop=8 softtabstop=4 shiftwidth=4<CR>
-nmap <Leader>m :set expandtab tabstop=2 shiftwidth=2 softtabstop=2<CR>
+nnoremap coe :set <C-R>=&expandtab ? 'noexpandtab' : 'expandtab'<CR><CR>
+nnoremap [oe :set expandtab<CR>
+nnoremap ]oe :set noexpandtab<CR>
+
+for idt in range(1,8)
+ exe 'nnoremap co'.idt.' :set tabstop='.idt.' shiftwidth='.idt.' softtabstop='.idt.'<CR>'
+endfor
" space will toggle current fold in normal mode
nnoremap <leader><Space> za
@@ -398,11 +404,6 @@ cnoremap w!! w !sudo tee % > /dev/null
inoremap <C-C> <Esc>gUiwgi
" plugins options {{{1
-" ag {{{2
-let g:AgSmartCase = 1
-nnoremap <leader>ag yiw:Ag "<cr>
-vnoremap <leader>ag y:Ag "<cr>
-
" airline {{{2
let g:airline#extensions#whitespace#enabled = 1
let g:airline#extensions#tabline#enabled = 1
@@ -430,7 +431,7 @@ autocmd BufReadPost fugitive://* set bufhidden=delete
nnoremap <silent> <leader>gs :Gstatus<CR>
nnoremap <silent> <leader>gd :Gdiff<CR>
-nnoremap <silent> <leader>gc :tab Gcommit -v<CR>
+nnoremap <silent> <leader>gc :Gcommit -v<CR>
nnoremap <silent> <leader>ga :Gwrite<cr>
nnoremap <silent> <leader>gb :Gblame<cr>
@@ -482,7 +483,7 @@ let g:tagbar_autoshowtag = 1
let g:tagbar_width = 25
let g:tagbar_iconchars = ['+', '-']
-" UltiSnips {{{2
+" ultisnips {{{2
let g:UltiSnipsEditSplit = 'vertical'
let g:UltiSnipsSnippetsDir = expand("$XDG_CONFIG_HOME/vim/ultisnips")
let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"]
@@ -512,6 +513,52 @@ endfunction
au InsertEnter * exec "inoremap <silent> " . g:UltiSnipsExpandTrigger . " <C-R>=g:UltiSnips_Complete()<cr>"
let g:UltiSnipsListSnippets="<c-e>"
+" unite {{{2
+call unite#filters#matcher_default#use(['matcher_fuzzy'])
+call unite#custom#profile('default', 'context', {
+ \ 'winheight': 20,
+ \ 'direction': 'botright'
+ \ })
+
+nnoremap [unite] <Nop>
+nmap <leader>u [unite]
+
+" unite-grep {{{3
+" seems not respected
+let g:unite_source_grep_max_candidates = 2000
+if executable('ag')
+ " Use ag in unite grep source.
+ let g:unite_source_grep_command = 'ag'
+ let g:unite_source_grep_default_opts = '--smart-case -w --vimgrep --hidden --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'''
+ let g:unite_source_grep_recursive_opt = ''
+end
+nnoremap <silent> [unite]a :<C-u>Unite grep -input=<CR>
+
+" unite-file_rec {{{3
+if executable('ag')
+ " Use ag in unite rec source
+ let g:unite_source_rec_async_command = 'ag --follow --nocolor --nogroup --hidden -g ""'
+end
+nnoremap <silent> [unite]f :<C-u>Unite -start-insert file_rec/async<CR>
+
+" unite-buffer {{{3
+call unite#custom#default_action('buffer', 'goto')
+nnoremap <silent> [unite]b :<C-u>Unite buffer<CR>
+
+" unite-menu {{{3
+let g:unite_source_menu_menus = {}
+let g:unite_source_menu_menus.fugitive = { 'description' : 'fugitive menu'}
+let g:unite_source_menu_menus.fugitive.command_candidates = {
+ \ 'Gstatus <Leader>gs' : 'Gstatus',
+ \ 'Gcommit -v <Leader>gc' : 'Gcommit -v',
+ \ 'Glog' : 'Glog',
+ \}
+
+nnoremap <silent> <leader>gg :<C-u>Unite menu:fugitive<CR>
+
+let g:unite_source_history_yank_enable = 1
+nnoremap <silent> [unite]p :<C-u>Unite history/yank<CR>
+
" yankring {{{2
nnoremap <silent> <leader>p :YRShow<cr>
let g:yankring_history_dir = expand('$XDG_CACHE_HOME/vim')
@@ -593,7 +640,7 @@ nmap <leader>ev :call EditConfig('vimrc')<CR>
nmap <leader>ef :call EditConfig('ftplugin')<CR>
nmap <leader>es :call EditConfig('syntax')<CR>
nmap <leader>ei :call EditConfig('indent')<CR>
-nmap <leader>eu :UltiSnipsEdit<CR>
+nmap <leader>eu :UltiSnipsEdit<CR>:lcd %:p:h<CR>
" spell check {{{2
" http://tex.stackexchange.com/a/52932