Revert "Remove nvim for now"

This reverts commit 5e22cd0a811fe1f09e645b67ee73bc4bd8d720f3.

bashrc

@@ -58,8 +58,8 @@ if ! shopt -oq posix; then
 fi
 
 # allow ctrl+S in vim to save files, ie pass the command to vim when vim is open.
-export EDITOR="vim"
-#alias vim="nvim"
+export EDITOR="nvim"
+alias vim="nvim"
 
 dot_sync() {
   current_branch=$(git branch | grep '\*.*' | cut -d '*' -f 2 | tr -d ' ')

gitconfig

@@ -3,14 +3,8 @@
   name = Andrew Swistak
 [push]
   default = simple
-[merge]
-  tool = vimdiff
 [interactive]
   singlekey = true
-[mergetool]
-  prompt = false
-[core]
-  editor = vim
 [alias]
   lol = log --oneline
   c = commit
@@ -21,11 +15,16 @@
   ca = commit -a
   d = diff
   ch = checkout
-	;ch = "!~/.gitexplode"
-;[mergetool "vimdiff"]
-  ;cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd W' -c '$wincmd J'
+[core]
+  editor = nvim
 [diff]
   tool = vimdiff
+[merge]
+  tool = vimdiff
+[mergetool]
+  prompt = false
+[mergetool "vimdiff"]
+  cmd = nvim -d $BASE $LOCAL $REMOTE $MERGED -c '$wincmd W' -c '$wincmd J'
 [color]
   ui = auto
   diff = auto

zshrc

@@ -21,8 +21,8 @@ eval "$(hub alias -s)"
 
 # Allow ctrl+S in vim to save files, ie pass
 # the command to vim when vim is open.
-export EDITOR="vim"
-#alias vim="nvim"
+export EDITOR="nvim"
+alias vim="nvim"
 
 dot_sync() {
   current_branch=$(git branch | grep '\*.*' | cut -d '*' -f 2 | tr -d ' ')