vim: add more config bindings (ftplugin,syntax,indent)

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index e41093cc20dfa1cf81138d63c47363a88ff0de23..2cdb19d88c477dd9ea177477e9c527d25e1e73e6 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -21,7 +21,8 @@ Plugin 'elzr/vim-json'
 Plugin 'firef0x/pkgbuild.vim'
 Plugin 'junegunn/vim-easy-align'
 Plugin 'kien/ctrlp.vim'
-Plugin 'klen/python-mode'
+" Plugin 'klen/python-mode'
+Plugin 'wilywampa/python-mode'
 Plugin 'kshenoy/vim-signature'
 Plugin 'majutsushi/tagbar'
 Plugin 'raimondi/delimitmate'
@@ -52,9 +53,15 @@ Plugin 'ompugao/ctrlp-ros'
 
 " find an alternative
 Plugin 'http://git.code.sf.net/p/vim-latex/vim-latex'
-Plugin 'lokaltog/vim-easymotion'
+" Plugin 'lokaltog/vim-easymotion'
+Plugin 'justinmk/vim-sneak'
 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
@@ -166,7 +173,7 @@ set foldmethod=marker           " folding type
 set foldlevelstart=0            " value for 'foldlevel' when starting to edit a file
 
 " save and restore folds
-set viewoptions=folds,cursor    " don't save local options
+set viewoptions=cursor          " only save cursor position
 
 " diff mode {{{2
 set diffopt=filler,vertical
@@ -267,9 +274,6 @@ nnoremap <silent> <Leader>/ :silent nohl<CR>
 nnoremap <leader>[ :tabprev<cr>
 nnoremap <leader>] :tabnext<cr>
 
-" Wrap
-nnoremap <leader>W :set wrap!<cr>
-
 " paste from selection
 nnoremap <leader>p* :silent! set paste<CR>"*p:set nopaste<CR>
 " paste from clipboard
@@ -288,9 +292,6 @@ noremap ' `
 " Select (charwise) the contents of the current line, excluding indentation.
 nnoremap vv ^vg_
 
-" Toggle [i]nvisible characters
-nnoremap <leader>i :set list!<cr>
-
 " Unfuck my screen
 nnoremap U :syntax sync fromstart<cr>:AirlineRefresh<cr>:redraw!<cr>
 
@@ -352,9 +353,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
@@ -377,8 +375,7 @@ noremap <silent> <Leader>O :set paste<CR>m`O<ESC>``:set nopaste<CR>
 " Don't use Ex mode, use Q for formatting
 map Q gq
 
-" allow undoing in insert-mode
-inoremap <C-U> <C-G>u<C-U>
+" 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>
@@ -397,6 +394,9 @@ autocmd BufWinEnter *.* silent loadview
 " save with sudo
 cnoremap w!! w !sudo tee % > /dev/null
 
+" uppercase previous word
+inoremap <C-C> <Esc>gUiwgi
+
 " plugins options {{{1
 " ag {{{2
 let g:AgSmartCase = 1
@@ -410,6 +410,7 @@ let g:airline_powerline_fonts = 1
 
 " checkattach {{{2
 let g:checkattach_filebrowser = 'ranger'
+let g:checkattach_once = 'y'
 
 " delimitmate {{{2
 let delimitMate_expand_cr = 2
@@ -527,7 +528,7 @@ let g:ycm_extra_conf_globlist = ['~/src/*','/mnt/data/src/*']
 let g:ycm_global_ycm_extra_conf = expand('$XDG_CONFIG_HOME/vim/ycm_extra_conf.py')
 let g:ycm_extra_conf_vim_data = ['getcwd()']
 let g:ycm_add_preview_to_completeopt = 1
-let g:ycm_autoclose_preview_window_after_insertion = 1
+let g:ycm_autoclose_preview_window_after_insertion = 0
 "let g:ycm_extra_conf_vim_data = ['%:p']
 nnoremap <leader>jd :YcmCompleter GoTo<CR>
 
@@ -543,6 +544,24 @@ let g:tex_flavor='latex'
 let g:Tex_DefaultTargetFormat='pdf'
 let g:Tex_MultipleCompileFormats='pdf'
 
+" vim-sneak {{{2
+let g:sneak#streak = 1
+let g:sneak#target_labels = "aoeuisnthdpylrcgfqjkxzmwvz" " dvorak
+let g:sneak#use_ic_scs = 1  " follow 'ignorecase' and 'smartcase'
+
+" sneaky f and t
+nmap f <Plug>Sneak_f
+nmap F <Plug>Sneak_F
+xmap f <Plug>Sneak_f
+xmap F <Plug>Sneak_F
+omap f <Plug>Sneak_f
+omap F <Plug>Sneak_F
+nmap t <Plug>Sneak_t
+nmap T <Plug>Sneak_T
+xmap t <Plug>Sneak_t
+xmap T <Plug>Sneak_T
+omap t <Plug>Sneak_t
+omap T <Plug>Sneak_T
 
 " functions {{{1
 
@@ -554,6 +573,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>
+
 " spell check {{{2
 " http://tex.stackexchange.com/a/52932
 let g:myLangList=["en_gb","en_us","de","fr"]