diff --git a/users/jalr/modules/git.nix b/users/jalr/modules/git.nix index 4b55de3..d6acd8b 100644 --- a/users/jalr/modules/git.nix +++ b/users/jalr/modules/git.nix @@ -10,9 +10,11 @@ key = "3044E71E3DEFF49B586CF5809BF4FCCB90854DA9"; signByDefault = false; }; + diff-so-fancy = { + enable = true; + }; extraConfig = { init.defaultBranch = "main"; - core.pager = "${pkgs.diff-so-fancy}/bin/diff-so-fancy | less --tabs=4 -RFX"; diff.sops.textconv = "${pkgs.sops}/bin/sops -d"; pull.ff = "only"; alias.find-merge = "!sh -c 'commit=$0 && branch=\${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 -s | uniq -f1 -d | sort -n | tail -1 | cut -f2'";