home.git: provide git mergetool -t nixfmt

2025-03-20 15:38:02 +01:00 · 2025-03-20 15:38:02 +01:00 · 6f936dc3f8
parent 3516b5fb91
commit 6f936dc3f8
1 changed files with 6 additions and 0 deletions
--- a/home/common.nix
+++ b/home/common.nix
@ -3,6 +3,7 @@
  inputs,
  config,
  system,
+  lib,
  ...
 }:
 {
@ -48,6 +49,11 @@
      init.defaultBranch = "mainline";
      diff.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 (
        pkgs.writeText ".gitignore_global" ''
          # Direnv stuff #