X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/07c18bcc6f31633225fa25e824b8e12608951434..fe30bafea65b1dcfcfaba8776df43a8ec8a5dc91:/vim/vimrc

diff --git a/vim/vimrc b/vim/vimrc
index ec0ece1..31bc4b0 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -311,6 +311,10 @@ inoremap <c-e> <esc>A
 cnoremap <c-a> <home>
 cnoremap <c-e> <end>
 
+" proper movement when lines are wrapped
+noremap j gj
+noremap k gk
+
 " disable arrows
 noremap  <Up>    <NOP>
 noremap  <Down>  <NOP>
@@ -399,7 +403,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
@@ -438,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']