schmittlauch/nixconfigs
2
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

home.git: provide git mergetool -t nixfmt

Browse source
This commit is contained in:
Trolli Schmittlauch 2025-03-20 15:38:02 +01:00
parent 3516b5fb91
commit 6f936dc3f8
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
home/common.nix
View file

@ -3,6 +3,7 @@
inputs, inputs,
config, config,
system, system,
lib,
... ...
}: }:
{ {
@ -48,6 +49,11 @@
init.defaultBranch = "mainline"; init.defaultBranch = "mainline";
diff.tool = "vimdiff"; diff.tool = "vimdiff";
merge.tool = "vimdiff"; merge.tool = "vimdiff";
# provide `git mergetool -t nixfmt`
mergetool.nixfmt = {
cmd = "${lib.getExe pkgs.nixfmt-rfc-style} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
trustExitCode = true;
};
core.excludesfile = toString ( core.excludesfile = toString (
pkgs.writeText ".gitignore_global" '' pkgs.writeText ".gitignore_global" ''
# Direnv stuff # # Direnv stuff #