From 69238d560efbbc69619ae4f2ac7173d2d3c2ca7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Mon, 5 May 2025 10:38:27 +0200 Subject: [PATCH] git: use patdiff --- nix/homeModules/common/git.nix | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/nix/homeModules/common/git.nix b/nix/homeModules/common/git.nix index bcced0fd..14fc30c7 100644 --- a/nix/homeModules/common/git.nix +++ b/nix/homeModules/common/git.nix @@ -1,11 +1,20 @@ -{lib, ...}: { +{ + lib, + pkgs, + ... +}: { # git plugins programs.git = { lfs.enable = true; - delta = { - enable = true; - options.syntax-theme = "OneHalfLight"; - }; + }; + + # Wait for PR + # https://github.com/nix-community/home-manager/pull/6978 + home.packages = [ + pkgs.patdiff + ]; + programs.git.iniContent = { + diff.external = "${lib.getExe' pkgs.patdiff "patdiff-git-wrapper"}"; }; # git itself