From 6e33ac75096eb1edeb2b321d26a295c736203cad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sat, 27 May 2023 12:01:36 +0200 Subject: [PATCH] feat(git): replace delta with difftastic --- modules/programs/git.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/programs/git.nix b/modules/programs/git.nix index 225e50b..c3995dc 100644 --- a/modules/programs/git.nix +++ b/modules/programs/git.nix @@ -1,5 +1,6 @@ { config , lib +, pkgs , ... }: @@ -51,8 +52,8 @@ in extraConfig = { init.defaultBranch = "main"; merge.conflictstyle = "zdiff3"; + diff.external = getExe pkgs.difftastic; }; - delta.enable = true; signing = mkIf cfg.signing { key = "0x970C6E89EB0547A9"; signByDefault = true;