git: enable syntax highlighting in diffs via `delta`
Alan Pearce alan@alanpearce.eu
Fri, 16 Jun 2023 07:35:34 +0200
2 files changed, 13 insertions(+), 7 deletions(-)
M user/settings/git.nix → user/settings/git.nix
@@ -12,6 +12,14 @@ user = "alanpearce"; }; core = { commitGraph = true; + pager = "${pkgs.delta}/bin/delta"; + }; + interactive = { + diffFilter = "${pkgs.delta}/bin/delta --color-only"; + }; + delta = { + navigate = true; + light = true; }; pull = { rebase = true; @@ -26,15 +34,12 @@ }; rerere = { enable = true; }; + merge = { + conflictStyle = "diff3"; + }; diff = { algorithm = "patience"; - tool = "icdiff"; - }; - difftool = { - prompt = false; - }; - "difftool.icdiff" = { - cmd = "${pkgs.icdiff}/bin/icdiff --line-numbers $LOCAL $REMOTE"; + colorMoved = "default"; }; "difftool.sopsdiffer" = { textconf = "${pkgs.sops}/bin/sops -d";
M user/settings/zsh.nix → user/settings/zsh.nix
@@ -34,6 +34,7 @@ home.packages = with pkgs; [ fzf gh ghq + delta git gitstatus git-lfs