Fix vim issues

aburgel · Jun 4, 2020 · 5ee3665 · 5ee3665
1 parent 6a01922
commit 5ee3665
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/hooks/post-up b/hooks/post-up
@@ -1,12 +1,14 @@
-#!/bin/bash
+#!/bin/sh
 
 touch "$HOME"/.psqlrc.local
 
-if [ ! -e "$HOME"/.vim/autoload/plug.vim ]; then
+if [ -e "$HOME"/.vim/autoload/plug.vim ]; then
+  vim -E -s +PlugUpgrade +qa
+else
   curl -fLo "$HOME"/.vim/autoload/plug.vim --create-dirs \
       https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
 fi
-vim -u "$HOME"/.vimrc.bundles +PlugInstall +PlugClean! +qa -
+vim -u "$HOME"/.vimrc.bundles +PlugUpdate +PlugClean! +qa
 
 reset -Q
 

diff --git a/vimrc b/vimrc
@@ -173,7 +173,10 @@ set spellfile=$HOME/.vim-spell-en.utf-8.add
 set complete+=kspell
 
 " Always use vertical diffs
-set diffopt+=vertical
+if &diff
+    set diffopt-=internal
+    set diffopt+=vertical
+endif
 
 " Local config
 if filereadable($HOME . "/.vimrc.local")