From 75f983fea7f5b18a109eac659ed81b70c35529d9 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Sun, 28 Jul 2024 13:30:11 +0100
Subject: [PATCH] Revert "git: use `difftastic`"
This reverts commit c06fb20115754f6cb097320b65cf74c84557a2d2.
---
lib/shared/modules/git.nix | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/lib/shared/modules/git.nix b/lib/shared/modules/git.nix
index 628561e0..2a72b592 100644
--- a/lib/shared/modules/git.nix
+++ b/lib/shared/modules/git.nix
@@ -34,11 +34,6 @@
}
];
- difftastic = {
- background = "dark";
- enable = true;
- };
-
aliases = {
aa = "add --all";
assume = "update-index --assume-unchanged";
@@ -118,6 +113,7 @@
};
delta.line-numbers = true;
+ diff.tool = "vimdiff";
fetch.prune = true;
gpg.format = "ssh";
grep.lineNumber = true;