X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/775006605902e29dac10d5b56f07cf4728b5c902..c93cac14db0f7770cf76cad899142f807b31b36a:/vim/vimrc

diff --git a/vim/vimrc b/vim/vimrc
index b3947e6..17e2a1e 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -42,10 +42,11 @@ Plugin 'derekwyatt/vim-fswitch'
 " Plugin 'powerman/vim-plugin-viewdoc'
 
 Plugin 'airblade/vim-gitgutter'
-Plugin 'Raimondi/delimitMate'
-Plugin 'SirVer/ultisnips'
-Plugin 'Lokaltog/vim-easymotion'
+Plugin 'raimondi/delimitmate'
+Plugin 'sirver/ultisnips'
+Plugin 'lokaltog/vim-easymotion'
 Plugin 'junegunn/vim-easy-align'
+Plugin 'chrisbra/checkattach'
 
 " remove entries first
 set runtimepath -=$HOME/.vim
@@ -231,12 +232,6 @@ augroup cursor_pos
                 \ endif
 augroup END
 
-" auto source vimrc when saved {{{2
-augroup source_vimrc
-    au!
-    autocmd bufwritepost vimrc source $MYVIMRC
-augroup END
-
 " bindings {{{1
 
 " allow both <space> and / to be <leader>
@@ -393,9 +388,19 @@ let g:airline_detect_whitespace=2
 let g:airline#extensions#tabline#enabled = 1
 let g:airline_powerline_fonts = 1
 
+" checkattach {{{2
+let g:checkattach_filebrowser = 'ranger'
+
 " Gundo {{{2
 nnoremap <F7> :GundoToggle<CR>
 
+" fswitch {{{2
+nnoremap <silent> <Leader>ff :FSHere<CR>
+nnoremap <silent> <Leader>fl :FSRight<CR>
+nnoremap <silent> <Leader>fh :FSLeft<CR>
+nnoremap <silent> <Leader>fL :FSSplitRight<CR>
+nnoremap <silent> <Leader>fH :FSSplitLeft<CR>
+
 " fugitive {{{2
 nmap <silent> <leader>dd :tab split \| Gdiff \| wincmd h<CR>
 " delete fugitive buffers when closed
@@ -438,7 +443,11 @@ let g:tagbar_iconchars = ['+', '-']
 
 " UltiSnips {{{2
 let g:UltiSnipsEditSplit = 'vertical'
-let g:UltiSnipsSnippetsDir = "$XDG_CONFIG_HOME/vim/ultisnips"
+let g:UltiSnipsSnippetsDir = expand("$XDG_CONFIG_HOME/vim/ultisnips")
+let g:UltiSnipsSnippetDirectories = ["UltiSnips", "ultisnips"]
+let g:UltiSnipsExpandTrigger = "<C-L>"
+let g:UltiSnipsJumpForwardTrigger = "<C-L>"
+let g:UltiSnipsJumpBackwardTrigger = "<C-H>"
 
 " youcompleteme {{{2
 let g:ycm_extra_conf_globlist = ['~/src/*','/mnt/data/src/*']
@@ -449,9 +458,9 @@ let g:ycm_autoclose_preview_window_after_insertion = 1
 "let g:ycm_extra_conf_vim_data = ['%:p']
 nnoremap <leader>jd :YcmCompleter GoTo<CR>
 
-" vim-easy-align
+" vim-easy-align {{{2
 " start interactive EasyAlign in visual mode
-vnoremap <Enter> <Plug>(EasyAlign)
+vnoremap <CR> <Plug>(EasyAlign)
 
 " vim-json {{{2
 let g:vim_json_syntax_conceal = 0