X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/516f716351cec888c353c961e2934d61d2814891..b01e4c09f16e634eb3f6ebbddcb72a38fac37bf8:/vim/vimrc?ds=inline

diff --git a/vim/vimrc b/vim/vimrc
index d4e8e48..e8a5192 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -312,8 +312,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>
@@ -442,6 +442,7 @@ let g:UltiSnipsSnippetsDir = "$XDG_CONFIG_HOME/vim/ultisnips"
 " 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']