vim: fix togglelist mappings

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 23889f1e992244a308377e6cca687eff7b1acf8d..c6aee808e02f8389f501dee99b7b13826d64b4d5 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -14,8 +14,10 @@ call vundle#begin('$XDG_DATA_HOME/vim')
 
 Plugin 'gmarik/vundle'
 
+Plugin 'AndrewRadev/switch.vim'
 Plugin 'airblade/vim-gitgutter'
 Plugin 'bling/vim-airline'
+Plugin 'chrisbra/checkattach'
 Plugin 'derekwyatt/vim-fswitch'
 Plugin 'elzr/vim-json'
 Plugin 'firef0x/pkgbuild.vim'
@@ -26,6 +28,7 @@ Plugin 'kshenoy/vim-signature'
 Plugin 'majutsushi/tagbar'
 Plugin 'octol/vim-cpp-enhanced-highlight'
 Plugin 'raimondi/delimitmate'
+Plugin 'rdnetto/ycm-generator'
 Plugin 'scrooloose/syntastic'
 Plugin 'shougo/unite.vim'
 Plugin 'shougo/vimproc.vim'
@@ -33,11 +36,14 @@ Plugin 'sjl/gundo.vim'
 Plugin 'tomtom/tcomment_vim'
 Plugin 'tpope/vim-abolish'
 Plugin 'tpope/vim-endwise'
+Plugin 'tpope/vim-eunuch'
 Plugin 'tpope/vim-fugitive'
 Plugin 'tpope/vim-repeat'
-Plugin 'tpope/vim-surround'
+Plugin 'tpope/vim-surround'  "investigate vim-sandwich
 Plugin 'tpope/vim-unimpaired'
+Plugin 'tweekmonster/spellrotate.vim'
 Plugin 'valloric/youcompleteme'
+Plugin 'vim-scripts/mediawiki.vim'
 Plugin 'vim-scripts/replacewithregister'
 Plugin 'vim-scripts/yankring.vim'
 
@@ -52,27 +58,20 @@ Plugin 'honza/vim-snippets'
 Plugin 'kana/vim-textobj-user'
 Plugin 'julian/vim-textobj-variable-segment'
 Plugin 'sgur/vim-textobj-parameter'
+Plugin 'kana/vim-operator-user'
 
 " ros
 Plugin 'ompugao/ros.vim'
 Plugin 'ompugao/ctrlp-ros'
 
-" seems to have problems right now... may be add later?
-" Plugin 'jalcine/cmake.vim'
-" Plugin 'powerman/vim-plugin-viewdoc'
-
 " staging
 " find an alternative (latex-box? Automatic Latex Plugin?)
-Plugin 'http://git.code.sf.net/p/vim-latex/vim-latex'
-" Plugin 'lokaltog/vim-easymotion'
-Plugin 'chrisbra/checkattach'
-Plugin 'nathanaelkane/vim-indent-guides'
+Plugin 'vim-latex/vim-latex'
 Plugin 'alx741/vinfo'
-Plugin 'vim-scripts/mediawiki.vim'
 Plugin 'derekwyatt/vim-protodef'
-Plugin 'rdnetto/ycm-generator'
 " needs editing colorscheme
 " Plugin 'jeaye/color_coded'
+" Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
 
 call vundle#end()
 
@@ -327,7 +326,7 @@ command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) |
 
 " bindings {{{1
 
-" allow both <space> and / to be <leader>
+" allow both <space> and \ to be <leader>
 map <space> <leader>
 
 " make
@@ -492,12 +491,6 @@ inoremap <C-C> <Esc>gUiwgi
 " http://git.io/v3ZeU
 nmap <silent> <leader>qq :echo "hi<" . synIDattr(synID(line("."),col("."),1),"name") . '> trans<' . synIDattr(synID(line("."),col("."),0),"name") . "> lo<" . synIDattr(synIDtrans(synID(line("."),col("."),1)),"name") . ">"<CR>
 
-" commands {{{1
-command! Cd cd %:h
-command! Cr execute('cd ' . FindGitDirOrHome())
-command! LCd lcd %:h
-command! LCr execute('lcd ' . FindGitDirOrHome())
-
 " plugins options {{{1
 " airline {{{2
 let g:airline#extensions#whitespace#enabled = 1
@@ -572,6 +565,15 @@ let g:SignatureMap = {
   \ 'GotoPrevSpotAlpha'  :  "",
   \ }
 
+" switch
+let g:switch_mapping = "<Leader>s"
+
+" spellrotate
+nmap <silent> z] <Plug>(SpellRotateForward)
+nmap <silent> z[ <Plug>(SpellRotateBackward)
+vmap <silent> z] <Plug>(SpellRotateForwardV)
+vmap <silent> z[ <Plug>(SpellRotateBackwardV)
+
 " synastic {{{2
 let g:syntastic_enable_highlighting = 0
 let g:syntastic_error_symbol='E'
@@ -593,6 +595,9 @@ let g:tagbar_autoshowtag = 1
 let g:tagbar_width = 25
 let g:tagbar_iconchars = ['+', '-']
 
+" tcomments {{{2
+let g:tcommentTextObjectInlineComment = 'gic'
+
 " ultisnips {{{2
 let g:UltiSnipsEditSplit = 'vertical'
 let g:UltiSnipsSnippetsDir = expand("$XDG_CONFIG_HOME/vim/ultisnips")
@@ -634,6 +639,7 @@ call unite#custom#profile('default', 'context', {
 
 nnoremap [unite] <Nop>
 nmap <leader>u [unite]
+nnoremap [unite]u :UniteResume<CR>
 
 " unite-grep {{{3
 " seems not respected
@@ -736,6 +742,13 @@ if !exists(":DiffOrig")
                   \ | wincmd p | diffthis
 endif
 
+" sort operator {{{2
+function! SortLinesOpFunc(...)
+  '[,']sort
+endfunction
+nnoremap <silent> gs :<C-U>set operatorfunc=SortLinesOpFunc<CR>g@
+vnoremap <silent> gs :sort<cr>
+
 " edit configs  {{{2
 function! EditConfig(what)
     let l:dir = split(&runtimepath,',')[0]
@@ -805,5 +818,9 @@ function! FindGitDirOrHome()
     return '~'
   endif
 endfunction
+command! Cd cd %:h
+command! Cr execute('cd ' . FindGitDirOrHome())
+command! LCd lcd %:h
+command! LCr execute('lcd ' . FindGitDirOrHome())
 
 " vim:set et sw=2 ts=2 tw=78: