Add delta as git diff tool

bombadil.toml

@@ -46,3 +46,6 @@ gpg_agent = { source = "gnupg/gpg-agent.conf", target = ".gnupg/gpg-agent.conf"
 
 # zellij
 zellij = { source = "zellij", target = ".config/zellij" }
+
+# navi
+navi = { source = "navi", target = ".config/navi" }

gitconfig

@@ -1,10 +1,13 @@
 [init]
   defaultBranch = main
   templatedir = ~/.git_template
+
 [push]
   default = current
+
 [color]
   ui = auto
+
 [alias]
   aa = add --all
   ap = add --patch
@@ -19,21 +22,45 @@
   cleanup = "!git branch --merged | egrep -v \"(\\*|master|main|dev|develop)\" | xargs -r git branch -d"
   history = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit
   ignore = update-index --assume-unchanged
+
 [user]
   email = __[email]__
   name = __[name]__
   signingkey = __[signing_key]__
+
 [url "git@github.com:"]
   insteadOf = https://github.com
+
 [core]
   excludesfile = ~/.gitignore
+  pager = delta
+
 [fetch]
   prune = true
+
 [rebase]
   autosquash = true
+
 [diff]
   colorMoved = zebra
+
 [commit]
   gpgSign = true
+
 [sequence]
   editor = interactive-rebase-tool
+
+[interactive]
+  diffFilter = delta --color-only
+
+[delta]
+  navigate = true
+  light = false
+  line-numbers = true
+  side-by-side = true
+
+[merge]
+  conflictstyle = diff3
+
+[diff]
+  colorMoved = default

navi/config.yaml

@@ -0,0 +1,33 @@
+# THIS IS EXPERIMENTAL
+# the config file schema may change at any time
+
+style:
+  tag:
+    color: cyan # text color. possible values: https://bit.ly/3gloNNI
+    width_percentage: 26 # column width relative to the terminal window
+    min_width: 20 # minimum column width as number of characters
+  comment:
+    color: blue
+    width_percentage: 42
+    min_width: 45
+  snippet:
+    color: white
+
+finder:
+  command: skim # equivalent to the --finder option
+  # overrides: --tac # equivalent to the --fzf-overrides option
+  # overrides_var: --tac # equivalent to the --fzf-overrides-var option
+
+# cheats:
+  # paths: 
+    # - /path/to/some/dir
+    # - /path/to/another/dir
+  # path: /path/to/some/dir # (DEPRECATED) equivalent to the --path option
+
+# search:
+  # tags: git,!checkout # equivalent to the --tag-rules option
+
+shell:
+  command: bash # shell used for shell out. possible values: bash, zsh, dash, ...
+  # finder_command: bash # similar, but for fzf's internals
+