zsh: delete envoy.zsh

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 2ef56898e3d60a6ba2795bbadef32cc436018a41..1674f0f49e374b833b79b47d426dd823d84819e8 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -14,6 +14,7 @@ call vundle#begin('$XDG_DATA_HOME/vim')
 
 Plugin 'gmarik/vundle'
 
 
 Plugin 'gmarik/vundle'
 

+Plugin 'AndrewRadev/switch.vim'

 Plugin 'airblade/vim-gitgutter'
 Plugin 'bling/vim-airline'
 Plugin 'chrisbra/checkattach'
 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 '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-fugitive'
 Plugin 'tpope/vim-repeat'

-Plugin 'tpope/vim-surround'
+Plugin 'tpope/vim-surround'  "investigate vim-sandwich

 Plugin 'tpope/vim-unimpaired'
 Plugin 'tpope/vim-unimpaired'

+Plugin 'tweekmonster/spellrotate.vim'

 Plugin 'valloric/youcompleteme'
 Plugin 'valloric/youcompleteme'

+Plugin 'vim-scripts/mediawiki.vim'

 Plugin 'vim-scripts/replacewithregister'
 Plugin 'vim-scripts/yankring.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-textobj-user'
 Plugin 'julian/vim-textobj-variable-segment'
 Plugin 'sgur/vim-textobj-parameter'

+Plugin 'kana/vim-operator-user'

 
 " ros
 Plugin 'ompugao/ros.vim'
 
 " ros
 Plugin 'ompugao/ros.vim'


@@ -62,10 +67,10 @@ Plugin 'ompugao/ctrlp-ros'
 " staging
 " find an alternative (latex-box? Automatic Latex Plugin?)
 Plugin 'vim-latex/vim-latex'
 " staging
 " find an alternative (latex-box? Automatic Latex Plugin?)
 Plugin 'vim-latex/vim-latex'

-Plugin 'nathanaelkane/vim-indent-guides'

 Plugin 'alx741/vinfo'
 Plugin 'alx741/vinfo'

-Plugin 'vim-scripts/mediawiki.vim'

 Plugin 'derekwyatt/vim-protodef'
 Plugin 'derekwyatt/vim-protodef'

+Plugin 'ram-z/vim-clang-format'
+Plugin 'sgeb/vim-diff-fold'

 " needs editing colorscheme
 " Plugin 'jeaye/color_coded'
 " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp
 " needs editing colorscheme
 " Plugin 'jeaye/color_coded'
 " Check LucHermites plugins: https://github.com/LucHermitte/lh-cpp


@@ -203,8 +208,8 @@ set foldlevelstart=0            " value for 'foldlevel' when starting to edit a
 " open folds when jumping to line
 set foldopen+=jump
 
 " open folds when jumping to line
 set foldopen+=jump
 

-" save and restore folds
-set viewoptions=cursor          " only save cursor position
+set viewoptions=cursor          " save cursor position
+set viewoptions+=folds          " save folds

 
 " diff mode {{{2
 set diffopt+=filler         " show filler lines
 
 " diff mode {{{2
 set diffopt+=filler         " show filler lines


@@ -323,7 +328,7 @@ command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) |
 
 " bindings {{{1
 
 
 " bindings {{{1
 

-" allow both <space> and / to be <leader>
+" allow both <space> and \ to be <leader>

 map <space> <leader>
 
 " make
 map <space> <leader>
 
 " make


@@ -463,7 +468,7 @@ nnoremap [oe :set expandtab<CR>
 nnoremap ]oe :set noexpandtab<CR>
 
 for idt in range(1,8)
 nnoremap ]oe :set noexpandtab<CR>
 
 for idt in range(1,8)

-  exe 'nnoremap co'.idt.' :set tabstop='.idt.' shiftwidth='.idt.' softtabstop='.idt.'<CR>'
+  exe 'nnoremap co'.idt.' :setlocal tabstop='.idt.' shiftwidth='.idt.' softtabstop='.idt.'<CR>'

 endfor
 
 " toggle auto format of text
 endfor
 
 " toggle auto format of text


@@ -562,6 +567,15 @@ let g:SignatureMap = {
   \ 'GotoPrevSpotAlpha'  :  "",
   \ }
 
   \ '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'
 " synastic {{{2
 let g:syntastic_enable_highlighting = 0
 let g:syntastic_error_symbol='E'


@@ -583,6 +597,9 @@ let g:tagbar_autoshowtag = 1
 let g:tagbar_width = 25
 let g:tagbar_iconchars = ['+', '-']
 
 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")
 " ultisnips {{{2
 let g:UltiSnipsEditSplit = 'vertical'
 let g:UltiSnipsSnippetsDir = expand("$XDG_CONFIG_HOME/vim/ultisnips")


@@ -624,6 +641,7 @@ call unite#custom#profile('default', 'context', {
 
 nnoremap [unite] <Nop>
 nmap <leader>u [unite]
 
 nnoremap [unite] <Nop>
 nmap <leader>u [unite]

+nnoremap [unite]u :UniteResume<CR>

 
 " unite-grep {{{3
 " seems not respected
 
 " unite-grep {{{3
 " seems not respected