Adjust VSC aliases

.config/kitty/kitty.conf

@@ -1,5 +1,6 @@
 # Reference: https://sw.kovidgoyal.net/kitty/conf/
 
+term xterm-256color
 font_family hack
 scrollback_lines 100000
 mouse_hide_wait 3.0

.config/shell/aliases/common

@@ -22,10 +22,11 @@ alias \
 alias \
     w="curl https://wttr.in/"
 
-for cmd in code codium; do
-    command -v $cmd >/dev/null && alias $cmd="$cmd --password-store='gnome'"
-done
-command -v codium >/dev/null && alias c=code
+alias code="code --password-store='gnome'"
+if command -v codium >/dev/null; then
+    alias code="codium  --password-store='gnome'"
+fi
+alias c=code
 
 command -v pacman >/dev/null && alias p=pacman
 command -v zathura >/dev/null && alias z=zathura

.gitconfig

@@ -7,7 +7,8 @@
 	st = status -sb
 	stat = !git --no-pager diff --stat
 	sw = switch
-	dunk = !git diff | dunk
+	dft = difftool
+	dlog = "!f() { GIT_EXTERNAL_DIFF=difft git log -p --ext-diff; }; f"
 
 [pull]
 	rebase = true
@@ -21,5 +22,17 @@
 [gitreview]
 	remote = origin
 
+[diff]
+	tool = difftastic
+
+[difftool]
+	prompt = false
+
+[difftool "difftastic"]
+	cmd = difft "$LOCAL" "$REMOTE"
+
+[pager]
+	difftool = true
+
 [include]
 	path = ~/.config/git/.gitconfig

.installer/packages

@@ -31,6 +31,7 @@ code-any:deerawan.vscode-faker # Misc
 
 brew-any:kubectl helm shellcheck velero derailed/k9s/k9s fluxcd/tap/flux # Kubernetes related
 brew-any:zsh-autosuggestions zsh-history-substring-search zsh-syntax-highlighting # ZSH related
-brew-host-5cg9521pyj:weaveworks/tap/gitops azure/kubelogin/kubelogin azure-cli git-review
+brew-any:difftastic # Git related
+brew-host-5cg9521pyj:weaveworks/tap/gitops azure/kubelogin/kubelogin azure-cli git-review # Work related
 
 krew-any:ctx krew ns slice stern tree