From 0d25590eb32a34d3da23e1db0897072e94861f42 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Fri, 28 Mar 2025 19:07:01 +0100 Subject: [PATCH] git mergetool -t nixfmt: use unstable nixfmt For now, only the nixfmt from unstable has that feature. --- home/common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/home/common.nix b/home/common.nix index f65ceff..92cee82 100644 --- a/home/common.nix +++ b/home/common.nix @@ -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 (