Play around with starship and git deltas and shit

home/dot_config/git/config

@@ -1,3 +1,15 @@
+[core]
+    pager = delta
+[delta]
+    # https://dandavison.github.io/delta/configuration.html
+    hyperlinks = true
+    line-numbers = true
+    navigate = true
+    syntax-theme = Solarized (dark)
+[diff]
+    colorMoved = default
+[interactive]
+    diffFilter = delta --color-only
 [color]
     ui = true
     branch = always
@@ -26,10 +38,8 @@
     email = "max@gwairfelin.com"
 [includeIf "gitdir:~/src/esl/"]
     path = ~/.config/git/config-esl
-[diff]
-    tool = vimdiff
 [merge]
-    tool = vimdiff
+    conflictStyle = zdiff3
     ff = true
 [push]
     default = simple
@@ -56,7 +66,5 @@
     smtpuser = max
     smtpencryption = tls
     smtpserverport = 587
-[mergetool "vimdiff"]
-    cmd = nvim -d $LOCAL $BASE $REMOTE $MERGED -c "$wincmd w" -c "wincmd J"
 [help]
     autoCorrect = immediate