From 1a15a9e83fbe9915fdd7a3c40cbc8cb923a7d280 Mon Sep 17 00:00:00 2001 From: Charlie Root Date: Fri, 1 Nov 2024 20:54:24 +0100 Subject: [PATCH] git.nix: add difftastic as a git tool --- modules/other/git.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/other/git.nix b/modules/other/git.nix index 48a5a3f..fb50be3 100644 --- a/modules/other/git.nix +++ b/modules/other/git.nix @@ -1,10 +1,9 @@ { + lib, pkgs, config, ... -}: let - inherit (config.modules.other.system) username; -in { +}: { programs.git = { enable = true; lfs.enable = true; @@ -20,6 +19,7 @@ in { pull.ff = "only"; gpg.format = "ssh"; commit.gpgsign = "true"; + diff.external = "${pkgs.difftastic}/bin/difft"; rebase = { autoSquash = true; autoStash = true;