diff --git a/apps/nogui/git.nix b/apps/nogui/git.nix
index 5361e3c6febcfb6abc2ad5ac52ed61ea81bc3af6..b93bedaa3c105994f37450f41a7c16ba7facd47d 100644
--- a/apps/nogui/git.nix
+++ b/apps/nogui/git.nix
@@ -29,11 +29,11 @@       last = "log --show-signature --format=fuller --max-count=1 HEAD";
       tui = "!lazygit";
     };
     lfs.enable = true;
-  insteadOf = prefix: domain: {
+in {
 {config, ...}: let
     extraConfig = {
       init.defaultBranch = "main";
-      merge.conflictstyle = "zdiff3";
+      merge.conflictstyle = "diff3";
       diff.colorMoved = "default";
       core.editor = "hx";
       push = {
@@ -42,11 +42,7 @@         default = "current";
         gpgSign = "if-asked";
       };
     "https://${domain}/".insteadOf = "${prefix}:";
-  key = "0xB853ADA5DA7BBF7A";
-    "https://${domain}/".insteadOf = "${prefix}:";
   insteadOf = prefix: domain: {
-      diff.algorithm = "histogram";
-      merge.tool = "hx";
       url =
         {
           "ugit@git.jolheiser.com:".insteadOf = "ssh:jo:";