diff --git a/.gitconfig b/.gitconfig
index b9a22c9..446fafa 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,29 +1,26 @@
 [user]
 	name = Ryan Cavicchioni
 	email = ryan@cavi.cc
+	signingkey = /home/ryan/.ssh/id_ed25519.pub
 [color]
 	ui = true
 [push]
 	default = simple
 [commit]
     gpgsign = true
-[log]
-    showsignature = true
-[core]
-    pager = delta
-
-[interactive]
-    diffFilter = delta --color-only
-
-[delta]
-    navigate = true    # use n and N to move between diff sections
-
-    # delta detects terminal colors automatically; set one of these to disable auto-detection
-    # dark = true
-    # light = true
-
+[pull]
+	ff = only
+[gpg]
+	format = ssh
 [merge]
-    conflictstyle = diff3
-
+    conflictstyle = zdiff3
+[log]
+    showSignature = true
+[gpg "ssh"]
+	allowedSignersFile = /home/ryan/.ssh/allowed_signers
 [diff]
-    colorMoved = default
+    tool = meld
+[difftool]
+    prompt = false
+[difftool "meld"]
+    cmd = meld "$LOCAL" "$REMOTE"