@@ -14,7 +14,6 @@ walk
     nuspell
     git-extras # delete-merged-branches and friends
     git-worktree-switcher
-    mergiraf
     gitui
     gitstatus
     hut # sourcehut tools
@@ -29,54 +28,11 @@ home.shellAliases = {
     wprop = "xprop | egrep '^WM_(CLASS|NAME|WINDOW_ROLE|TYPE)'";
   };
 
+  programs.mergiraf.enable = true;
+
   programs.git = {
     difftastic = {
       enable = true;
-    };
-    attributes = [
-      # `mergiraf languages --gitattributes`
-      "*.java merge=mergiraf"
-      "*.kt merge=mergiraf"
-      "*.rs merge=mergiraf"
-      "*.go merge=mergiraf"
-      "*.js merge=mergiraf"
-      "*.jsx merge=mergiraf"
-      "*.mjs merge=mergiraf"
-      "*.json merge=mergiraf"
-      "*.yml merge=mergiraf"
-      "*.yaml merge=mergiraf"
-      "*.toml merge=mergiraf"
-      "*.html merge=mergiraf"
-      "*.htm merge=mergiraf"
-      "*.xhtml merge=mergiraf"
-      "*.xml merge=mergiraf"
-      "*.c merge=mergiraf"
-      "*.h merge=mergiraf"
-      "*.cc merge=mergiraf"
-      "*.cpp merge=mergiraf"
-      "*.hpp merge=mergiraf"
-      "*.cs merge=mergiraf"
-      "*.dart merge=mergiraf"
-      "*.dts merge=mergiraf"
-      "*.scala merge=mergiraf"
-      "*.sbt merge=mergiraf"
-      "*.ts merge=mergiraf"
-      "*.tsx merge=mergiraf"
-      "*.py merge=mergiraf"
-      "*.php merge=mergiraf"
-      "*.phtml merge=mergiraf"
-      "*.sol merge=mergiraf"
-      "*.lua merge=mergiraf"
-      "*.rb merge=mergiraf"
-      "*.nix merge=mergiraf"
-      "*.sv merge=mergiraf"
-      "*.svh merge=mergiraf"
-    ];
-    extraConfig = {
-      "merge.mergiraf" = {
-        name = "mergiraf";
-        driver = "${pkgs.mergiraf}/bin/mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P -l %L";
-      };
     };
   };
   programs.gh = {