Revert "Use difftastic for git diffing"

This reverts commit 895aa07eea96f718f57aa3157c51b0a4c3ef32d4.

1 files changed, 1 insertions, 12 deletions

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