git: enable mergiraf

hyshka · Dec 2, 2024 · 80c6a63 · 80c6a63
1 parent e197912
commit 80c6a63
Showing 1 changed file with 19 additions and 2 deletions.
diff --git a/home/cli/git.nix b/home/cli/git.nix
@@ -1,4 +1,8 @@
-{config, ...}: {
+{pkgs, ...}: {
+  home.packages = [
+    pkgs.mergiraf
+  ];
+
   programs.git = {
     enable = true;
     userName = "hyshka";
@@ -14,11 +18,24 @@
       push.autoSetupRemote = true;
       status.showUntrackedFiles = "all";
       merge.ff = "only";
-      merge.conflictstyle = "diff3";
+      merge.conflictstyle = "zdiff3";
       mergetool.keepBackup = false;
+      merge.mergiraf.name = "mergiraf";
+      merge.mergiraf.driver = "mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P";
     };
+    attributes = [
+      "*.js merge=mergiraf"
+      "*.jsx merge=mergiraf"
+      "*.json merge=mergiraf"
+      "*.yml merge=mergiraf"
+      "*.yaml merge=mergiraf"
+      "*.html merge=mergiraf"
+    ];
     delta = {
       enable = true;
+      options = {
+        navigate = true;
+      };
     };
     lfs.enable = true;
     ignores = [".direnv" "result"];