zsh: gpg-agent is started on demand

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index e41093cc20dfa1cf81138d63c47363a88ff0de23..8725572323c16af76c07a92561a10e468bc07c18 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 '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'
 Plugin 'kshenoy/vim-signature'
 Plugin 'majutsushi/tagbar'
 Plugin 'raimondi/delimitmate'


@@ -52,10 +53,15 @@ Plugin 'ompugao/ctrlp-ros'
 
 " find an alternative
 Plugin 'http://git.code.sf.net/p/vim-latex/vim-latex'
 
 " 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 'chrisbra/checkattach'
 Plugin 'nathanaelkane/vim-indent-guides'
 

+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
 " remove entries first
 set runtimepath -=$HOME/.vim
 set runtimepath -=$HOME/.vim/after


@@ -166,7 +172,7 @@ set foldmethod=marker           " folding type
 set foldlevelstart=0            " value for 'foldlevel' when starting to edit a file
 
 " save and restore folds
 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
 
 " diff mode {{{2
 set diffopt=filler,vertical


@@ -267,9 +273,6 @@ nnoremap <silent> <Leader>/ :silent nohl<CR>
 nnoremap <leader>[ :tabprev<cr>
 nnoremap <leader>] :tabnext<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
 " paste from selection
 nnoremap <leader>p* :silent! set paste<CR>"*p:set nopaste<CR>
 " paste from clipboard


@@ -288,9 +291,6 @@ noremap ' `
 " Select (charwise) the contents of the current line, excluding indentation.
 nnoremap vv ^vg_
 
 " 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>
 
 " Unfuck my screen
 nnoremap U :syntax sync fromstart<cr>:AirlineRefresh<cr>:redraw!<cr>
 


@@ -377,8 +377,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
 
 " 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>
 inoremap <C-W> <C-G>u<C-W>
 
 nmap <Leader>b :set expandtab tabstop=4 shiftwidth=4 softtabstop=4<CR>


@@ -397,6 +396,9 @@ autocmd BufWinEnter *.* silent loadview
 " save with sudo
 cnoremap w!! w !sudo tee % > /dev/null
 
 " 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
 " plugins options {{{1
 " ag {{{2
 let g:AgSmartCase = 1


@@ -410,6 +412,7 @@ let g:airline_powerline_fonts = 1
 
 " checkattach {{{2
 let g:checkattach_filebrowser = 'ranger'
 
 " checkattach {{{2
 let g:checkattach_filebrowser = 'ranger'

+let g:checkattach_once = 'y'

 
 " delimitmate {{{2
 let delimitMate_expand_cr = 2
 
 " delimitmate {{{2
 let delimitMate_expand_cr = 2


@@ -527,7 +530,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_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>
 
 "let g:ycm_extra_conf_vim_data = ['%:p']
 nnoremap <leader>jd :YcmCompleter GoTo<CR>
 


@@ -543,6 +546,24 @@ let g:tex_flavor='latex'
 let g:Tex_DefaultTargetFormat='pdf'
 let g:Tex_MultipleCompileFormats='pdf'
 
 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
 
 
 " functions {{{1