From 9a3734f2debeb693fe9432a8d838e4f4ee04e25c Mon Sep 17 00:00:00 2001 From: Matthew Ryan Dillon Date: Mon, 19 May 2025 08:57:22 -0400 Subject: [PATCH] dropping git-delta ive been writing a lot on mobile and this format is extra painful on narrow displays. --- home/private_dot_config/jj/config.toml.tmpl | 21 +++++---------------- home/run_once_01install-packages.sh.tmpl | 1 - 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/home/private_dot_config/jj/config.toml.tmpl b/home/private_dot_config/jj/config.toml.tmpl index 67922e9..fb7b1e0 100644 --- a/home/private_dot_config/jj/config.toml.tmpl +++ b/home/private_dot_config/jj/config.toml.tmpl @@ -6,28 +6,17 @@ email = {{ .email_personal | quote }} push-bookmark-prefix = "{{ .github_personal }}_jj_" private-commits = "description(glob:'private:*') | bookmarks('merge')" +[colors] +"diff removed token" = { fg = "red", underline = false } +"diff added token" = { fg = "green", underline = false } + [revset-aliases] "stack()" = "trunk()..@" "immutable_heads()" = "builtin_immutable_heads() | (trunk().. & ~mine())" [ui] default-command = ["log"] -pager = "delta" - -[ui.diff] -format = "git" - -[merge-tools.delta] -diff-args = [ - "--color-only", - "--features", "chameleon", - "--navigate", - "--dark", - "--side-by-side", - "--true-color", "always", - "--syntax-theme", "base16", - "$left", "$right", -] +diff.format = "git" [[--scope]] --when.repositories = ["~/Klaviyo", "~/.klaviyocli"] diff --git a/home/run_once_01install-packages.sh.tmpl b/home/run_once_01install-packages.sh.tmpl index 9506940..4ec8b53 100644 --- a/home/run_once_01install-packages.sh.tmpl +++ b/home/run_once_01install-packages.sh.tmpl @@ -15,7 +15,6 @@ brew install \ fzf \ gh \ git \ - git-delta \ glow \ go \ golangci-lint \