1 files changed, 40 insertions, 2 deletions

diff --git a/home/home-minimal.nix b/home/home-minimal.nix
index 42f358d..cfeb2b2 100644
--- a/home/home-minimal.nix
+++ b/home/home-minimal.nix
@@ -131,15 +131,53 @@
     extraConfig = {
       log.showSignature = true;
       init.defaultBranch = "main";
-      alias.search = "!git log --format='tformat:%h %cs %s' --no-show-signature | fzf --multi --preview 'git show {+1}|bat -p -lpatch --color=always' | cut -f1 -d\" \" | wl-copy -n && wl-paste";
-      alias.where = "!fish -c git-where";
       merge.conflictStyle = "zdiff3";
       push.autoSetupRemote = true;
+      pull.rebase = true;
       commit.verbose = true;
       rerere.enabled = true;
       branch.sort = "-authordate";
+      tag.sort = "version:refname";
+      column.ui = "auto";
+
+      diff = {
+        algorithm = "histogram";
+        colorMoved = "plain";
+        mnemoicPrefix = true;
+        renames = true;
+      };
+
+      alias = {
+        search = "!git log --format='tformat:%h %cs %s' --no-show-signature | fzf --multi --preview 'git show {+1}|bat -p -lpatch --color=always' | cut -f1 -d\" \" | wl-copy -n && wl-paste";
+        where  = "!fish -c git-where";
+      };
+
+      merge.mergiraf = {
+        name = "mergiraf";
+        driver = "merigraf merge --git %O %A %B -s %S -x %X -y %Y -p %P";
+      };
     };
 
+    attributes = [
+      "*.java merge=mergiraf"
+      "*.rs merge=mergiraf"
+      "*.go merge=mergiraf"
+      "*.js merge=mergiraf"
+      "*.jsx merge=mergiraf"
+      "*.json merge=mergiraf"
+      "*.yml merge=mergiraf"
+      "*.yaml merge=mergiraf"
+      "*.html merge=mergiraf"
+      "*.htm merge=mergiraf"
+      "*.xhtml merge=mergiraf"
+      "*.xml merge=mergiraf"
+      "*.c merge=mergiraf"
+      "*.h merge=mergiraf"
+      "*.cpp merge=mergiraf"
+      "*.hpp merge=mergiraf"
+      "*.cs merge=mergiraf"
+    ];
+
     # diff-so-fancy.enable = true;
     # difftastic.enable = true;
     delta = {