vim: vimwiki has finally merged my no_override_map branch

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 1e994bc50502f434ed752f909ca97066e58e35af..40c987b686bf236e40bdc2e2e9591709fccd18d6 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -31,7 +31,7 @@ Plug 'majutsushi/tagbar'
 Plug 'octol/vim-cpp-enhanced-highlight'
 Plug 'raimondi/delimitmate'
 Plug 'ram-z/vim-clang-format', { 'branch': 'fix-undo' }
-Plug 'ram-z/vimwiki', { 'branch': 'no_override_map' }
+Plug 'ram-z/vimwiki', { 'branch': 'dev' }
 Plug 'scrooloose/syntastic'
 Plug 'sgeb/vim-diff-fold'
 Plug 'shougo/unite.vim'
@@ -53,7 +53,7 @@ Plug 'vim-scripts/replacewithregister'
 Plug 'vim-scripts/yankring.vim'
 
 " colorschemes
-Plug 'flazz/vim-colorschemes'
+Plug 'morhetz/gruvbox'
 
 " snippets
 Plug 'sirver/ultisnips'
@@ -84,6 +84,8 @@ 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
 
 " options {{{1
 " moving around, searching and patterns {{{2
@@ -534,6 +536,11 @@ nnoremap <silent> <leader>gc :Gcommit -v<CR>
 nnoremap <silent> <leader>ga :Gwrite<cr>
 nnoremap <silent> <leader>gb :Gblame<cr>
 
+augroup fugitive_gstatus
+    au!
+    autocmd BufWinEnter */.git/index resize 16
+augroup end
+
 " Gundo {{{2
 nnoremap <F7> :GundoToggle<CR>