Commit d511a14

@@ -16,7 +16,7 @@
           pkgs.git
           pkgs.git-lfs
 
-          pkgs.delta
+          pkgs.difftastic
         ];
 
         files.".gitconfig".type = "delete";
@@ -43,19 +43,7 @@
               smudge = "${lfsPath} smudge -- %f";
             };
 
-            # Delta
-            delta = {
-              diff-so-fancy = true;
-              line-numbers = true;
-              true-color = "always";
-            };
-            interactive.diffFilter = "${lib.getExe pkgs.delta} --color-only";
-            pager = {
-              blame = "${lib.getExe pkgs.delta}";
-              diff = "${lib.getExe pkgs.delta}";
-              log = "${lib.getExe pkgs.delta}";
-              show = "${lib.getExe pkgs.delta}";
-            };
+            diff.external = "${lib.getExe pkgs.difftastic}";
           };
         };
       };

@@ -31,8 +31,14 @@
               email = user.identity.email;
             };
             ui = {
-              diff-formatter = ":git";
-              pager = "${lib.getExe pkgs.delta}";
+              diff-formatter =
+                [(lib.getExe pkgs.difftastic)]
+                ++ (lib.cli.toCommandLineGNU {} {
+                  color = "always";
+                  sort-paths = true;
+                  width = "$width";
+                })
+                ++ ["$left" "$right"];
             };
           };
         };