Use mergiraf, difftastic for git

Author: ethnt

modules/profiles/home/git/common.nix

@@ -1,22 +1,21 @@
-{ config, pkgs, lib, ... }: {
+{ config, pkgs, lib, ... }:
+let
+  mkGitShellScript = { name, text, extraRuntimeInputs ? [ ] }:
+    lib.getExe (pkgs.writeShellApplication {
+      inherit name text;
+
+      runtimeInputs = [ config.programs.git.package ] ++ extraRuntimeInputs;
+    });
+in {
   home.packages = with pkgs; [ delta ];
 
   programs.git = {
     enable = true;
 
-    settings = let delta = lib.getExe pkgs.delta;
-    in {
+    settings = {
       user.name = "Ethan Turkeltaub";
 
       alias = let
-        gh = lib.getExe pkgs.gh;
-        mkGitShellScript = { name, text, extraRuntimeInputs ? [ ] }:
-          lib.getExe (pkgs.writeShellApplication {
-            inherit name text;
-
-            runtimeInputs = [ config.programs.git.package ]
-              ++ extraRuntimeInputs;
-          });
         superprune = mkGitShellScript {
           name = "git-alias-superprune";
           text = ''
@@ -49,14 +48,10 @@
         superprune = "!sh ${superprune}";
         co = "!sh ${co}";
         wipe = "!sh ${wipe}";
-        sync = "!${gh} repo sync";
+        sync = "!${lib.getExe pkgs.gh} repo sync";
       };
 
-      core.pager = delta;
-
-      interactive.diffFilter = "${delta} --color-only";
-
-      http = { sslCAinfo = "/etc/ssl/certs/ca-certificates.crt"; };
+      http.sslCAinfo = "/etc/ssl/certs/ca-certificates.crt";
 
       color = {
         status = "always";

modules/profiles/home/git/difftastic.nix

@@ -0,0 +1,9 @@
+{
+  programs.difftastic = {
+    enable = true;
+    git = {
+      enable = true;
+      diffToolMode = true;
+    };
+  };
+}

modules/profiles/home/git/large-repos.nix

@@ -1,21 +1,14 @@
-{ lib, ... }:
-
-with lib;
-
 {
-  programs.git = {
-    aliases.s = mkOverride 10 "status -uno";
-    extraConfig = {
-      core = {
-        compression = 9;
-        packedgitwindowsize = "32g";
-        preloadindex = true;
-        deltabasecachelimit = "2g";
-      };
-      feature.manyfiles = true;
-      fetch.prune = true;
-      merge.renameLimit = 10000;
-      push.default = "simple";
+  programs.git.settings = {
+    core = {
+      compression = 9;
+      packedgitwindowsize = "32g";
+      preloadindex = true;
+      deltabasecachelimit = "2g";
     };
+    feature.manyfiles = true;
+    fetch.prune = true;
+    merge.renameLimit = 10000;
+    push.default = "simple";
   };
 }

modules/profiles/home/git/mergiraf.nix

@@ -0,0 +1 @@
+{ programs.mergiraf.enable = true; }

modules/suites/home.nix

@@ -24,14 +24,14 @@ with profiles;
     tools.darwin
     xdg
     zed-editor
-    zellij
   ];
 
-  development = [ git.common gh gh-dash vscode ];
+  development =
+    [ git.common git.difftastic git.mergiraf gh gh-dash mise vscode ];
 
   identity = [ gnupg.default ];
 
-  work = [ git.large-repos mise ];
+  work = [ git.large-repos ];
 
   minimal = [ autojump bat fish fzf git.common gh navi starship tools.common ];
 }

users/et/home.nix

@@ -1,7 +1,7 @@
 { suites, secrets, profiles, ... }: {
   imports = with suites;
-    base ++ development ++ identity ++ (with profiles; [ haskell nodejs ])
-    ++ [ secrets.users.et.home ] ++ [
+    base ++ development ++ work ++ identity
+    ++ (with profiles; [ haskell nodejs ]) ++ [ secrets.users.et.home ] ++ [
       ./profiles/git.nix
       ./profiles/jujutsu.nix
       ./profiles/tmuxp.nix