diff --git a/sam/configuration.nix b/sam/configuration.nix
index df70d83..5ed5ae7 100644
--- a/sam/configuration.nix
+++ b/sam/configuration.nix
@@ -90,15 +90,16 @@
       # TODO: delta or diff-so-fancy or difftastic
       extraConfig = {
         init.defaultBranch = "main";
+        diff.wsErrorHighlight = "all";
         pull.ff = "only";
-        url."https://aur.archlinux.org/".insteadOf = "aur:";
-        url."ssh://aur@aur.archlinux.org/".pushInsteadOf = "aur:";
         url."ssh://git@github.com/ChandlerSwift/".insteadOf = "gh:";
         url."ssh://forgejo@bert/chandlerswift/".insteadOf = "forgejo:";
         push.autoSetupRemote = true;
         rebase.autosquash = true;
         rebase.autostash = true;
         fetch.parallel = 0; # "some reasonable default"
+        fetch.prune = true;
+        merge.conflictstyle = "diff3";
       };
       ignores = [
         "*.kate-swp"