add git-delta

env/linux.sh

@@ -112,6 +112,7 @@ install_rust_cmds lsd zoxide bat killport joshuto
 install_rust_special_cmd rg ripgrep
 install_rust_special_cmd fd fd-find
 install_rust_special_cmd sk skim
+install_rust_special_cmd delta git-delta
 
 # github does not support direct password when using https, needs gcm
 which git-credential-manager-core

env/mac.sh

@@ -60,7 +60,7 @@ brew install zoxide
 # brew install mysql
 
 ## dev
-brew install --cask wezterm postman tree
+brew install --cask wezterm postman tree git-delta
 # lrzsz  ## wezterm does not support rz/sz
 
 # blade and cxx

gitconfig.mac

@@ -1,11 +1,6 @@
 [user]
   name = ericuni
   email = ericuni90+git@gmail.com
-[core]
-  editor = nvim
-  autocrlf = false
-  quotepath = false
-  ignorecase = false
 [push]
   default = current
 [pull]
@@ -18,3 +13,26 @@
   process = git-lfs filter-process
   required = true
 
+[core]
+  editor = nvim
+  autocrlf = false
+  quotepath = false
+  ignorecase = false
+  pager = delta
+
+[interactive]
+  diffFilter = delta --color-only
+
+[delta]
+  navigate = true  # use n and N to move between diff sections
+  side-by-side = false
+  dark = true
+  line-numbers = true
+  max-line-length = 0  # prevent any truncation https://github.com/dandavison/delta/issues/299
+
+[merge]
+  conflictstyle = diff3
+
+[diff]
+  colorMoved = default
+