vim: skip preview window when moving between windows

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 2ef56898e3d60a6ba2795bbadef32cc436018a41..ef35da8cc431c37b407c1bc515edaf12f2c92c8d 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -14,6 +14,7 @@ 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'
@@ -35,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'
 
@@ -54,6 +58,7 @@ 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'
@@ -62,9 +67,7 @@ Plugin 'ompugao/ctrlp-ros'
 " staging
 " find an alternative (latex-box? Automatic Latex Plugin?)
 Plugin 'vim-latex/vim-latex'
-Plugin 'nathanaelkane/vim-indent-guides'
 Plugin 'alx741/vinfo'
-Plugin 'vim-scripts/mediawiki.vim'
 Plugin 'derekwyatt/vim-protodef'
 " needs editing colorscheme
 " Plugin 'jeaye/color_coded'
@@ -323,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
@@ -432,9 +435,9 @@ nnoremap zx zMzxzt
 
 map <F1> :ls<CR>:b<space>
 
-" move between windows
-nnoremap <C-L> <C-W>w
-nnoremap <C-H> <C-W>W
+" move between windows (skip previewwindow)
+nnoremap <silent> <C-L> <C-W>w:if &previewwindow \| wincmd w \| endif<CR>
+nnoremap <silent> <C-H> <C-W>W:if &previewwindow \| wincmd W \| endif<CR>
 
 "xterm mouse with middleclick paste
 nnoremap <MiddleMouse> i<MiddleMouse>
@@ -562,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'
@@ -583,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")
@@ -624,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