X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/300ab2850e2bc62f257da41ae09efa9d06f6ef0f..4fd50d9e4fe77fc8bd0d3c2b356b15e4b13757eb:/vim/vimrc

diff --git a/vim/vimrc b/vim/vimrc
index d927be1..e59de75 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
@@ -310,6 +313,8 @@ nmap <Leader># :%s:<C-R>/::gn<CR>
 " center cursor after search and open folds
 nnoremap n nzzzv
 nnoremap N Nzzzv
+nnoremap ^O ^Ozzzv
+nnoremap ^I ^Izzzv
 
 " same when jumping around
 nnoremap g; g;zzzv
@@ -353,9 +358,6 @@ cnoremap <C-L>   <Right>
 " close all folds open fold in cursor
 nnoremap zx zMzxzt
 
-" edit vimrc in new tab
-nmap <leader>ev :tabedit $MYVIMRC<CR>:lcd %:p:h<CR>
-
 map <F1> :ls<CR>:b<space>
 
 nnoremap <C-L> <C-W>w
@@ -381,10 +383,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
@@ -401,11 +406,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
@@ -433,7 +433,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>
 
@@ -485,7 +485,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"]
@@ -515,6 +515,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')
@@ -576,6 +622,28 @@ if !exists(":DiffOrig")
                   \ | wincmd p | diffthis
 endif
 
+" edit configs  {{{2
+function! EditConfig(what)
+    let l:dir = split(&runtimepath,',')[0]
+    if a:what == 'vimrc'
+        let l:file = expand($MYVIMRC)
+    elseif ! isdirectory(globpath(l:dir, a:what))
+        echoe a:what." is not valid!"
+    elseif empty(&filetype)
+        echoe 'filetype is empty!'
+    else
+        let l:file = l:dir.'/'.a:what.'/'.&filetype.'.vim'
+    endif
+
+    execute ':vsplit '.file
+    execute ':lcd %:p:h'
+endf
+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>:lcd %:p:h<CR>
+
 " spell check {{{2
 " http://tex.stackexchange.com/a/52932
 let g:myLangList=["en_gb","en_us","de","fr"]