diff options
| author | Anton Bobov <anton@bobov.name> | 2025-12-18 23:03:15 +0500 |
|---|---|---|
| committer | Anton Bobov <anton@bobov.name> | 2025-12-25 14:27:25 +0500 |
| commit | f7a7833abf497351087f3583f6490f149bb374be (patch) | |
| tree | b4f18d3fb71ab4ae87091442ce13927f8ff9dbd9 | |
| parent | 76c88387e6ba4e5da22d0cd75c1a3888b758453e (diff) | |
git: migrate to delta from diff-so-fancy
| -rw-r--r-- | files/.config/lazygit/config.yml | 5 | ||||
| -rw-r--r-- | files/.eget.toml | 5 | ||||
| -rw-r--r-- | files/.gitconfig | 13 |
3 files changed, 14 insertions, 9 deletions
diff --git a/files/.config/lazygit/config.yml b/files/.config/lazygit/config.yml index 59c35e4..f248b4f 100644 --- a/files/.config/lazygit/config.yml +++ b/files/.config/lazygit/config.yml @@ -8,9 +8,8 @@ gui: frames: ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'] rate: 100 git: - paging: - colorArg: always - pager: diff-so-fancy + pagers: + - pager: delta --paging=never --hyperlinks-file-link-format="lazygit-edit://{path}:{line}" # Do not spawn a separate process when using GPG # https://github.com/jesseduffield/lazygit/discussions/3605#discussioncomment-9567079 overrideGpg: true diff --git a/files/.eget.toml b/files/.eget.toml index f56b6e9..140700b 100644 --- a/files/.eget.toml +++ b/files/.eget.toml @@ -17,5 +17,6 @@ target = "~/.local/bin/nnn" ["mvdan/sh"] target = "~/.local/bin/shfmt" -# Good-lookin' diffs. Actually… nah… The best-lookin' diffs. 🎉 -["so-fancy/diff-so-fancy"] +# A syntax-highlighting pager for git, diff, grep, and blame output +["dandavison/delta"] +asset_filters = [ "linux-gnu.tar.gz" ] diff --git a/files/.gitconfig b/files/.gitconfig index d89fa3d..12ae541 100644 --- a/files/.gitconfig +++ b/files/.gitconfig @@ -26,9 +26,14 @@ colorMoved = true submodule = log mnemonicprefix = true -[diff-so-fancy] - stripLeadingSymbols = false - markEmptyLines = false +[delta] + light = true + syntax-theme = Solarized (light) + navigate = true + file-decoration-style = ol ul + hyperlinks = true +[interactive] + diffFilter = delta --color-only [grep] lineNumber = true [merge] @@ -36,7 +41,7 @@ stat = true tool = vimdiff [core] - pager = diff-so-fancy | less -+$LESS -FRX + pager = delta excludesfile = ~/.gitignore quotepath = false attributesfile = ~/.gitattributes |