1 files changed, 10 insertions, 0 deletions
diff --git a/user/settings/git.nix b/user/settings/git.nix
index b1750618..ae5947d5 100644
--- a/user/settings/git.nix
+++ b/user/settings/git.nix
@@ -70,6 +70,10 @@ in
       merge = {
         conflictStyle = "zdiff3";
       };
+      "merge.mergiraf" = {
+        name = "mergiraf";
+        driver = "${pkgs.mergiraf}/bin/mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L";
+      };
       diff = {
         algorithm = "histogram";
         colorMoved = "plain";
@@ -159,11 +163,17 @@ in
       };
     };
   };
+  xdg.configFile."git/attributes" = {
+    source = (pkgs.runCommandLocal "mergiraf-gitattributes" { } ''
+      ${pkgs.mergiraf}/bin/mergiraf languages --gitattributes >> $out
+    '');
+  };
   home.packages = with pkgs; [
     git-extras # delete-merged-branches and friends
     git-worktree-switcher
     ghq
     # reduce these on server
+    mergiraf
     gitui
     gitstatus
     hut # sourcehut tools