vim: Gwrite is actually git add, map accordingfy

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 34da981aca40b3ae32ecda8e6d97818b8967b363..d4e8e489a404e4536327a3aac0c551676644a0ad 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -158,8 +158,12 @@ set foldlevelstart=0            " value for 'foldlevel' when starting to edit a
 " save and restore folds
 set viewoptions=folds,cursor    " don't save local options
 
+" diff mode {{{2
+set diffopt=filler,vertical
+
 " reading and writing files {{{2
-set nomodeline                  " don't read modelines
+set modeline                    " read modelines
+set modelines=2                 " only check first/last 2 lines
 set writebackup                 " write a backup file before overwriting a file
 set backup                      " keep a backup after owerwriting a file
 set backupdir=$XDG_CACHE_HOME/vim//
@@ -307,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>
@@ -329,7 +337,7 @@ cnoremap <C-L>   <Right>
 nnoremap zx zMzxzz15<C-e>
 
 " edit vimrc in new tab
-nmap <leader>ev :tabedit $MYVIMRC<CR>
+nmap <leader>ev :tabedit $MYVIMRC<CR>:lcd %:p:h<CR>
 
 map <F1> :ls<CR>:b<space>
 
@@ -395,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
@@ -504,4 +512,3 @@ function! g:ToggleNumber()
 endfunction
 nnoremap <silent><leader>n :call g:ToggleNumber()<cr>
 nnoremap <silent><leader>N :setlocal relativenumber!<cr>
-