From dd47b35a43d4f49716112391b49f00a78702c459 Mon Sep 17 00:00:00 2001
From: Brian Picciano <me@mediocregopher.com>
Date: Fri, 19 Jul 2024 15:24:03 +0200
Subject: Revert "Use difftastic for git diffing"

This reverts commit 895aa07eea96f718f57aa3157c51b0a4c3ef32d4.
---
 base/gitconfig |  3 ---
 default.nix    | 13 +------------
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/base/gitconfig b/base/gitconfig
index 8732a4d..eb1ca38 100644
--- a/base/gitconfig
+++ b/base/gitconfig
@@ -1,9 +1,6 @@
 [include]
     path = custom
 
-[diff]
-    external = "difft --display inline"
-
 [push]
     default = simple
 
diff --git a/default.nix b/default.nix
index 921d775..9da4a9f 100644
--- a/default.nix
+++ b/default.nix
@@ -44,17 +44,7 @@ in rec {
 
   gitWrapped = pkgs.writeShellScript "git" ''
     export XDG_CONFIG_HOME=${gitConfig}
-    bin="${pkgs.git}/bin/git"
-
-    # Overwrite show an log sub-commands to always set --ext-diff. git aliases
-    # don't allow for overwritting sub-commands, or I'd use them instead.
-    if [ "$1" = "show" ] || [ "$1" = "log" ]; then
-      subCmd="$1"
-      shift
-      exec "$bin" "$subCmd" --ext-diff "$@"
-    fi
-
-    exec "$bin" "$@"
+    exec ${pkgs.git}/bin/git "$@"
   '';
 
   git = pkgs.runCommand "mediocregopher-git" {} ''
@@ -93,7 +83,6 @@ in rec {
       pkgs.less
       pkgs.tmux
       pkgs.calc
-      pkgs.difftastic
       pkgs.units
 
       pkgs.man
-- 
cgit v1.2.3