git: more robust fallback to PAGER when delta isn't found

branchvincent · Jul 22, 2024 · 47ddf6b · 47ddf6b
1 parent 5c94493
commit 47ddf6b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.config/fish/config.fish b/.config/fish/config.fish
@@ -16,7 +16,6 @@ path is $socket && set -gx SSH_AUTH_SOCK $socket
 
 set -Uq fish_features || set -U fish_features all
 string match -q "$TERM_PROGRAM" vscode && set -gx EDITOR code --wait
-command -q delta || set -gx GIT_PAGER $PAGER
 command -q docker podman || functions -e docker
 
 # Daily update

diff --git a/.config/git/config b/.config/git/config
@@ -4,8 +4,8 @@
 [github]
     user = branchvincent
 [core]
-    autocrlf = input                            # normalize line endings on commit (but not checkout)
-    pager = delta --diff-so-fancy --navigate    # use a better diff visualizer
+    autocrlf = input    # normalize line endings on commit (but not checkout)
+    pager = command -v delta &>/dev/null && delta --diff-so-fancy --navigate || ${PAGER:-less}  # use a better diff visualizer
 [color "diff"]
     meta = yellow
     frag = magenta bold