Improve git diff tooling, add jj config

git/config

@@ -7,6 +7,7 @@
     whitespace = error
     preloadindex = true
     untrackedCache = true
+    pager = delta
 
 [status]
     branch = true
@@ -19,15 +20,15 @@
     interHunkContext = 10
     algorithm = histogram
 
-[pager]
+[delta]
-    diff = diff-so-fancy | $PAGER
+    navigate = true
-
+    dark = false
-[diff-so-fancy]
+    side-by-side = true
-    markEmptyLines = false
+    pager = "less --RAW-CONTROL-CHARS --quit-if-one-screen"
-    stripLeadingSymbols = false
 
 [interactive]
     singleKey = true
+    diffFilter = delta --color-only
 
 [push]
     autoSetupRemote = true

jj/config.toml

@@ -0,0 +1,17 @@
+[user]
+name = "Martin Larsson"
+email = "larssonmartin1998@gmail.com"
+
+[ui]
+editor = "nvim"
+pager = "delta"
+diff-formatter = ":git"
+default-command = "log"
+
+[diff]
+context-lines = 10
+
+[merge-tools.nvim]
+program = "nvim"
+merge-args = ["$output"]
+merge-tool-edits-conflict-markers = true

nix/home/default.nix

@@ -53,6 +53,10 @@ let
       ".config/git"
       "git"
     ]
+    [
+      ".config/jj"
+      "jj"
+    ]
     [
       ".config/colorsync"
       "colorsync"
@@ -130,7 +134,7 @@ in
       bc
       cmatrix
       svelte-language-server
-      diff-so-fancy
+      delta
       obsidian
       helix
       xh

zsh/.zshrc

@@ -149,8 +149,8 @@ alias ga="git add"
 alias gap="git add --patch"
 alias gi="git init"
 alias gcl="git clone"
-alias gd="git diff --output-indicator-new=' ' --output-indicator-old=' '"
+alias gd="git diff"
-alias gds="git diff --staged --output-indicator-new=' ' --output-indicator-old=' '"
+alias gds="git diff --staged"
 alias gl="git log --all --graph --pretty=format:'%C(magenta)%h %C(white) %an %ar%C(auto) %D%n%s%n'"
 alias gm="git merge"
 alias gr="git rebase"