1 files changed, 14 insertions, 3 deletions
diff --git a/users/timmy/default.nix b/users/timmy/default.nix
index dfac6ea..d91c5c1 100644
--- a/users/timmy/default.nix
+++ b/users/timmy/default.nix
@@ -98,9 +98,20 @@ in {
 			# Setup git
 			programs.git = {
 				enable = true;
-				settings.user = {
-					name = fullname;
-					email = email;
+				settings = {
+					user = {
+						name = fullname;
+						email = email;
+					};
+					merge.tool = "nvimdiff";
+					mergetool.nvimdiff = {
+						cmd = ''nvim -d "$LOCAL" "$MERGED" "$REMOTE"'';
+						prompt = false;
+					};
+					# Unfortunately, this doesn't work for some reason
+					#url = {
+					#	"ssh://git@publicgit/".insteadOf = "https://git.tjkeller.xyz/";
+					#};
 				};
 			};