From 6f936dc3f881d54ebf7b9da3b5fbf3be5d9ecf25 Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch@orlives.de>
Date: Thu, 20 Mar 2025 15:38:02 +0100
Subject: [PATCH] home.git: provide `git mergetool -t nixfmt`

---
 home/common.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/home/common.nix b/home/common.nix
index 6f9c9c7..f65ceff 100644
--- 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 #