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

git mergetool -t nixfmt: use unstable nixfmt

Browse source 
For now, only the nixfmt from unstable has that feature.
This commit is contained in:
Trolli Schmittlauch 2025-03-28 19:07:01 +01:00
parent cdb5e568da
commit 0d25590eb3
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
home/common.nix
View file

@ -51,7 +51,7 @@
merge.tool = "vimdiff";
# provide `git mergetool -t nixfmt`
mergetool.nixfmt = {
cmd = "${lib.getExe pkgs.nixfmt-rfc-style} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
cmd = "${lib.getExe inputs.nixos-unstable.legacyPackages.${system}.nixfmt-rfc-style} --mergetool \"$BASE\" \"$LOCAL\" \"$REMOTE\" \"$MERGED\"";
trustExitCode = true;
};
core.excludesfile = toString (