From bebbff504d24b22691323ec31dd66255bb5c352f Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Mon, 18 May 2026 14:42:04 -0700 Subject: [PATCH] cli: switch from delta to hunk for git diff viewing Hunk is a review-first terminal diff viewer. Delta binary is still installed (via programs.delta.enable = true) but git integration is disabled so hunk owns the GIT_PAGER/diff.tool slot. --- home/profiles/cli/default.nix | 18 ++++++++++++++++++ home/profiles/git/default.nix | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/home/profiles/cli/default.nix b/home/profiles/cli/default.nix index 036e9f1..b7191fc 100644 --- a/home/profiles/cli/default.nix +++ b/home/profiles/cli/default.nix @@ -2,9 +2,27 @@ lib, pkgs, config, + inputs, ... }: { + imports = [ + # hunk - review-first terminal diff viewer + inputs.hunk.homeManagerModules.hunk + ]; + + programs.hunk = { + enable = true; + package = inputs.hunk.packages.${pkgs.stdenv.hostPlatform.system}.default; + enableGitIntegration = true; + settings = { + theme = "graphite"; + mode = "auto"; + line_numbers = true; + exclude_untracked = false; + }; + }; + home.packages = with pkgs; [ diff --git a/home/profiles/git/default.nix b/home/profiles/git/default.nix index 2d196e4..4e51930 100644 --- a/home/profiles/git/default.nix +++ b/home/profiles/git/default.nix @@ -13,9 +13,10 @@ ]; # Delta (git diff pager) - moved to top-level in home-manager 25.11 + # Git integration disabled in favor of hunk (see ../cli/default.nix); delta binary still available. programs.delta = { enable = true; - enableGitIntegration = true; + enableGitIntegration = false; }; programs.git = { -- 2.51.2