From c83ec91ae20e1ae3db70c35b860b4e1301fe8ba3 Mon Sep 17 00:00:00 2001 From: Elec3137 Date: Tue, 24 Mar 2026 11:13:21 -0700 Subject: [PATCH] defaults/git: add note, refine delta code --- defaults/git.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/defaults/git.nix b/defaults/git.nix index fefc524..5f1baba 100644 --- a/defaults/git.nix +++ b/defaults/git.nix @@ -14,6 +14,7 @@ in options = { nixowos.defaults.${name}.enable = lib.mkEnableOption name; + # NOTE: this doesn't really belong in defaults/ programs.${name}.delta.enable = lib.mkEnableOption "delta within git" // { default = true; }; @@ -35,9 +36,9 @@ in merge.conflictStyle = "zdiff3"; commit.verbose = true; # show diffs in commit editor } - (lib.mkIf superCfg.delta.enable { - core.pager = "${pkgs.delta}/bin/delta"; - interactive.diffFilter = "${pkgs.delta}/bin/delta --color-only"; + (lib.mkIf (superCfg.delta.enable && config.nixowos.allowAddingPackages) { + core.pager = "${lib.getExe pkgs.delta}"; + interactive.diffFilter = "${lib.getExe pkgs.delta} --color-only"; delta.navigate = true; # use n and N to move between diff sections delta.diff-highlight = true; # simpler mode, highlights inter-line changes })