zsh/prompt: don't try to populate git prompt if not in git repo

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 38e050a63778f30943c94a34083b50040efc6daf..675b5ab2fc4f5f551057152b6dbf714b57b8f4d5 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -18,7 +18,12 @@ call plug#begin('$XDG_DATA_HOME/vim')
 " This does not update vim-plug, use PlugUpgrade instead
 Plug 'junegunn/vim-plug'
 
-Plug 'airblade/vim-gitgutter'
+Plug 'airblade/vim-gitgutter' " {{{
+" prefer other signs such as ycm diags
+let g:gitgutter_sign_priority = 1
+" don't clobber other signs
+let g:gitgutter_sign_allow_clobber = 0
+"}}}
 Plug 'alepez/vim-gtest'
 Plug 'alx741/vinfo'
 Plug 'andrewradev/switch.vim'
@@ -57,7 +62,21 @@ Plug 'vim-scripts/yankring.vim'
 Plug 'wincent/loupe'
 
 " colorschemes
-Plug 'morhetz/gruvbox'
+Plug 'morhetz/gruvbox' " {{{2
+let g:gruvbox_contrast_dark  = 'hard'
+let g:gruvbox_contrast_light = 'soft'
+
+Plug 'arcticicestudio/nord-vim' " {{{2
+let g:nord_bold = 1
+let g:nord_italic = 1
+let g:nord_italic_comments = 1
+let g:nord_underline = 1
+let g:nord_uniform_status_lines = 0
+let g:nord_uniform_diff_background = 0
+let g:nord_cursor_line_number_background = 0
+let g:nord_bold_vertical_split_line = 0
+
+"}}}
 
 " snippets
 Plug 'sirver/ultisnips'
@@ -91,6 +110,14 @@ let g:haskell_backpack = 1                " to enable highlighting of backpack k
 
 Plug 'aklt/plantuml-syntax'
 
+Plug 'mtth/scratch.vim'  " {{{2
+  let g:scratch_no_mappings = 1
+"}}}
+
+Plug 'vim-utils/vim-man'  " {{{2
+let g:man_width = 80
+"}}}
+
 call plug#end()
 
 filetype plugin indent on
@@ -98,11 +125,7 @@ filetype plugin indent on
 " colorscheme {{{1
 syntax on
 set background=dark
-let g:gruvbox_contrast_dark  = 'hard'
-let g:gruvbox_contrast_light = 'soft'
-colorscheme gruvbox
-" override the background to be black
-highligh Normal ctermbg=None
+colorscheme $THEME
 
 " options {{{1
 " moving around, searching and patterns {{{2
@@ -412,7 +435,11 @@ noremap ' `
 nnoremap vv ^vg_
 
 " Unfuck my screen
-nnoremap U :syntax sync fromstart<cr>:AirlineRefresh<cr>:redraw!<cr>
+nnoremap U
+      \ :syntax sync fromstart<cr>
+      \ :AirlineRefresh<cr>
+      \ :call popup_clear(1)<cr>
+      \ :redraw!<cr>
 
 " Ranger
 " nnoremap <leader>r :silent !ranger %:h<cr>:redraw!<cr>
@@ -562,7 +589,13 @@ autocmd BufReadPost fugitive://* set bufhidden=delete
 
 nnoremap <silent> <leader>gs :Git<CR>
 nnoremap <silent> <leader>gd :Gdiffsplit<CR>
-nnoremap <silent> <leader>gc :tab G commit -v<CR>
+nnoremap <silent> <leader>gc :echohl WarningMsg \| echo "use \<leader>gcc instead" \| echohl None<CR> 
+nnoremap <silent> <leader>gcc :tab G commit -v<CR>
+nnoremap <silent> <leader>gca :tab G commit -v --amend<CR>
+nnoremap          <leader>gcf :tab G commit -v --fixup=
+nnoremap <silent> <leader>gp :echohl WarningMsg \| echo "use \<leader>gpp instead" \| echohl None<CR> 
+nnoremap <silent> <leader>gpp :G push<CR>
+nnoremap <silent> <leader>gpf :G push --force-with-lease<CR>
 nnoremap <silent> <leader>ga :Gwrite<cr>
 nnoremap <silent> <leader>gb :G blame<cr>
 
@@ -701,7 +734,7 @@ if executable('ag')
 end
 nnoremap <silent> [unite]a :<C-u>Unite grep:.::\12\17<CR>
 nnoremap <silent> [unite]A :<C-u>Unite grep:.:-w:\12\17<CR>
-command! -nargs=1 Ag Unite grep:.::<args>
+command! -nargs=+ Ag Unite -input=<args> grep:.:
 
 " unite-file_rec {{{3
 if executable('ag')
@@ -760,9 +793,11 @@ nmap ga <Plug>(EasyAlign)
 " vim-gtest {{{2
 let g:gtest#highlight_failing_tests = 0
 
-nnoremap <Leader>tt :GTestRun<CR>
-nnoremap <Leader>ta :GTestCase *<CR>:GTestName *<CR>:GTestRun<CR>
-nnoremap <Leader>tu :GTestRunUnderCursor<CR>
+nnoremap <silent> <Leader>tt :GTestRun<CR>
+nnoremap          <Leader>tc :GTestCase<space>
+nnoremap          <Leader>tn :GTestName<space>
+nnoremap <silent> <Leader>ta :GTestCase *<CR>:GTestName *<CR>:GTestRun<CR>
+nnoremap <silent> <Leader>tu :GTestRunUnderCursor<CR>
 
 " vim-json {{{2
 let g:vim_json_syntax_conceal = 0