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 5baddd8823ca11813c3cebad684796a889a496ec..675b5ab2fc4f5f551057152b6dbf714b57b8f4d5 100644 (file)
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -62,7 +62,21 @@ Plug 'vim-scripts/yankring.vim'
 Plug 'wincent/loupe'
 
 " colorschemes
 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'
 
 " snippets
 Plug 'sirver/ultisnips'


@@ -100,6 +114,10 @@ Plug 'mtth/scratch.vim'  " {{{2
   let g:scratch_no_mappings = 1
 "}}}
 
   let g:scratch_no_mappings = 1
 "}}}
 

+Plug 'vim-utils/vim-man'  " {{{2
+let g:man_width = 80
+"}}}
+

 call plug#end()
 
 filetype plugin indent on
 call plug#end()
 
 filetype plugin indent on


@@ -107,11 +125,7 @@ filetype plugin indent on
 " colorscheme {{{1
 syntax on
 set background=dark
 " 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
 
 " options {{{1
 " moving around, searching and patterns {{{2


@@ -421,7 +435,11 @@ noremap ' `
 nnoremap vv ^vg_
 
 " Unfuck my screen
 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>
 
 " Ranger
 " nnoremap <leader>r :silent !ranger %:h<cr>:redraw!<cr>