zsh: Only set SSH_AUTH_SOCK when not already set

[dotfiles.git] / vim / vimrc

diff --git a/vim/vimrc b/vim/vimrc
index 5ca33ac197a3979d26310dcf70b4ac2d5e4b0782..90cf14f818f28d68465bf0da99ed6d655071c2dd 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -30,8 +30,8 @@ Plug 'kshenoy/vim-signature'
 Plug 'majutsushi/tagbar'
 Plug 'octol/vim-cpp-enhanced-highlight'
 Plug 'raimondi/delimitmate'
 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/vim-clang-format', { 'branch': 'fix-undo' }
+Plug 'vimwiki/vimwiki', { 'branch': 'dev' }

 Plug 'scrooloose/syntastic'
 Plug 'sgeb/vim-diff-fold'
 Plug 'shougo/unite.vim'
 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 'vim-scripts/yankring.vim'
 
 " colorschemes

-Plug 'flazz/vim-colorschemes'
+Plug 'morhetz/gruvbox'

 
 " snippets
 Plug 'sirver/ultisnips'
 
 " 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
 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
 
 " options {{{1
 " moving around, searching and patterns {{{2


@@ -110,7 +112,7 @@ set list                        " show chars defined in 'listchars'
 set listchars=tab:❭\            " list of strings used for list mode
 set listchars+=extends:❯,precedes:❮
 " Only shown when not in insert mode
 set listchars=tab:❭\            " list of strings used for list mode
 set listchars+=extends:❯,precedes:❮
 " Only shown when not in insert mode

-au InsertLeave * :set listchars+=trail:·
+set listchars+=trail:·

 augroup trailing
     au!
     au InsertEnter * :set listchars-=trail:·
 augroup trailing
     au!
     au InsertEnter * :set listchars-=trail:·


@@ -534,6 +536,11 @@ nnoremap <silent> <leader>gc :Gcommit -v<CR>
 nnoremap <silent> <leader>ga :Gwrite<cr>
 nnoremap <silent> <leader>gb :Gblame<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>
 
 " Gundo {{{2
 nnoremap <F7> :GundoToggle<CR>