Some changes to git and fish

README.md

@@ -1,4 +1,6 @@
 ```sh
+cargo install topgrade lsd git-delta cargo-update
+
 set -U fish_greeting
 
 fish_config theme choose 'Tomorrow Night Bright'

fish/config.fish

@@ -23,6 +23,11 @@ abbr -a -- q pueue
 alias j  z
 alias jj zz
 
+alias ls lsd
+alias l ls
+alias ll 'ls -la'
+alias llh 'ls -lha'
+
 if test -r ~/.asdf/asdf.fish
     source ~/.asdf/asdf.fish
 end

git/config

@@ -58,6 +58,7 @@
 [core]
 	excludesfile = ~/.config/git/ignore
 	editor = vim
+	pager = delta
 [commit]
 	verbose = true
 	gpgSign = true
@@ -78,10 +79,11 @@
 	fsckobjects = true
 
 [merge]
-	conflictstyle = zdiff3
+	conflictstyle = diff3
 
 [diff]
 	algorithm = histogram
+	colorMoved = default
 
 [rerere]
 	enabled = true
@@ -91,3 +93,10 @@
 
 [receive]
 	fsckObjects = true
+
+[interactive]
+    diffFilter = delta --color-only
+
+[delta]
+    navigate = true    # use n and N to move between diff sections
+    light = false      # set to true if you're in a terminal w/ a light background color (e.g. the default macOS terminal)