jalr/nixos-configuration
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use option to configure diff-so-fancy

Browse source
This commit is contained in:
Jakob Lechner 2024-05-28 22:48:48 +02:00
parent 4944b21be7
commit a3cad64c9b
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
users/jalr/modules/git.nix
View file

@ -10,9 +10,11 @@
key = "3044E71E3DEFF49B586CF5809BF4FCCB90854DA9"; key = "3044E71E3DEFF49B586CF5809BF4FCCB90854DA9";
signByDefault = false; signByDefault = false;
}; };
diff-so-fancy = {
enable = true;
};
extraConfig = { extraConfig = {
init.defaultBranch = "main"; 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"; diff.sops.textconv = "${pkgs.sops}/bin/sops -d";
pull.ff = "only"; 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'"; 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'";