X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/f821f723f48521851d5e4c5546b8a4dabd3de1de..11d76e6d2619692acd6b543ccbb368dc42122e9f:/vim/vimrc?ds=inline

diff --git a/vim/vimrc b/vim/vimrc
index 576e984..40e3190 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -45,6 +45,7 @@ Plugin 'airblade/vim-gitgutter'
 Plugin 'Raimondi/delimitMate'
 Plugin 'SirVer/ultisnips'
 Plugin 'Lokaltog/vim-easymotion'
+Plugin 'junegunn/vim-easy-align'
 
 " remove entries first
 set runtimepath -=$HOME/.vim
@@ -312,8 +313,8 @@ cnoremap <c-a> <home>
 cnoremap <c-e> <end>
 
 " proper movement when lines are wrapped
-noremap j gj
-noremap k gk
+noremap <expr> j (v:count == 0 ? 'gj' : 'j')
+noremap <expr> k (v:count == 0 ? 'gk' : 'k')
 
 " disable arrows
 noremap  <Up>    <NOP>
@@ -403,7 +404,7 @@ autocmd BufReadPost fugitive://* set bufhidden=delete
 nnoremap <silent> <leader>gs :Gstatus<CR>
 nnoremap <silent> <leader>gd :Gdiff<CR>
 nnoremap <silent> <leader>gc :tab Gcommit -v<CR>
-nnoremap <silent> <leader>gw :Gwrite<cr>
+nnoremap <silent> <leader>ga :Gwrite<cr>
 
 " NERDTree {{{2
 " open/close NERDTree with \e
@@ -437,16 +438,25 @@ 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/*']
 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_extra_conf_vim_data = ['%:p']
 nnoremap <leader>jd :YcmCompleter GoTo<CR>
 
+" vim-easy-align
+" start interactive EasyAlign in visual mode
+vnoremap <Enter> <Plug>(EasyAlign)
+
 " vim-json {{{2
 let g:vim_json_syntax_conceal = 0