X-Git-Url: https://git.rmz.io/dotfiles.git/blobdiff_plain/485933001d2f0ec0b99fb70e6e7d053e5da16123..abc1010e7344fd407c66881645c52ebc7f57edfc:/vim/vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 6ac05a3..2817a01 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -257,14 +257,17 @@ set wildignore+=*.luac                           " Lua byte code
 set wildignore+=*.pyc                            " Python byte code
 set wildignore+=*.orig                           " Merge resolution files
 
-" running make and jumping to errors
+" running make and jumping to errors {{{2
 set makeprg=make\ -w     " print changing directories
 
+set grepprg=ag\ --vimgrep\ $*
+
 " language specific {{{2
 set isfname-==    " don't treat `=` as being part of filenames
 
 " various {{{2
-set virtualedit=all             " let cursor move past last char in <C-V> mode
+set virtualedit+=block     " let cursor move past last char in <C-V> mode
+set virtualedit+=onemore   " allow the cursor to move just past the end of the line
 set viminfo='100,<50,s10,h,n$XDG_CACHE_HOME/vim/viminfo " viminfo defaults but save file in .cache
 
 set viewdir=$XDG_CACHE_HOME/vim/view//
@@ -326,8 +329,8 @@ command! ToggleAutoChecktime let b:autochecktime=!get(b:, 'autochecktime', 0) |
 map <space> <leader>
 
 " make
-nnoremap <leader>r :make<cr>
-nnoremap <leader><cr> :make<cr>
+nnoremap <leader>r :make!<cr>
+nnoremap <leader><cr> :make!<cr>
 
 " unhighlight search
 nnoremap <silent> <Leader>/ :silent nohl<CR>
@@ -546,6 +549,16 @@ let g:pymode_folding = 1
 let g:pymode_lint_ignore = "E221,E266,E501"
 let g:pymode_syntax_space_errors = 0    " don't bother me when I'm typing
 
+" signature {{{2
+" disable '[ mappings
+
+let g:SignatureMap = {
+  \ 'GotoNextLineAlpha'  :  "",
+  \ 'GotoPrevLineAlpha'  :  "",
+  \ 'GotoNextSpotAlpha'  :  "",
+  \ 'GotoPrevSpotAlpha'  :  "",
+  \ }
+
 " synastic {{{2
 let g:syntastic_enable_highlighting = 0
 let g:syntastic_error_symbol='E'
@@ -618,7 +631,7 @@ if executable('ag')
     let g:unite_source_grep_default_opts = '--smart-case -w --vimgrep --hidden --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr'''
     let g:unite_source_grep_recursive_opt = ''
 end
-nnoremap <silent> [unite]a :<C-u>Unite grep -input=<CR>
+nnoremap <silent> [unite]a :<C-u>Unite grep:.::<CR>
 command! -nargs=1 Ag Unite grep -input=<args>
 
 " unite-file_rec {{{3