diff --git a/apps/nogui/git.nix b/apps/nogui/git.nix
index c7637ee716745b79d0c1c87e811de2d5f707569f..b3718693327658a941817a05798169e21f908b48 100644
--- a/apps/nogui/git.nix
+++ b/apps/nogui/git.nix
@@ -1,33 +1,26 @@
-{
-  pkgs,
+{config, ...}: let
-  config,
-  ...
-}: let
+  key = "0xB853ADA5DA7BBF7A";
   insteadOf = prefix: domain: {
     "https://${domain}/".insteadOf = "${prefix}:";
     "git@${domain}:".insteadOf = "ssh:${prefix}:";
   };
 {
+    "git@${domain}:".insteadOf = "ssh:${prefix}:";
 {
-{
+  };
+    enable = true;
+  pkgs,
 {
+    "https://${domain}/".insteadOf = "${prefix}:";
   pkgs,
-{
+    "https://${domain}/".insteadOf = "${prefix}:";
   config,
-{
+    "https://${domain}/".insteadOf = "${prefix}:";
   ...
-{
+    "https://${domain}/".insteadOf = "${prefix}:";
 }: let
 {
-  insteadOf = prefix: domain: {
-{
     "https://${domain}/".insteadOf = "${prefix}:";
-  };
-in {
-  programs.git = {
-    enable = true;
-    userName = "jolheiser";
-    userEmail = "git@jolheiser.com";
     aliases = {
       wt = "worktree";
       ci = "commit -s -S -m";
@@ -44,55 +38,60 @@       tui = "!lazygit";
     };
     lfs.enable = true;
     ignores = [".idea/" "result" "node_modules" "ve"];
-  config,
+    extraConfig = {
+      init.defaultBranch = "main";
+      merge.conflictstyle = "zdiff3";
+    "https://${domain}/".insteadOf = "${prefix}:";
   };
-  ...
+    "git@${domain}:".insteadOf = "ssh:${prefix}:";
-  ...
+    "git@${domain}:".insteadOf = "ssh:${prefix}:";
 {
-  ...
+    "git@${domain}:".insteadOf = "ssh:${prefix}:";
   pkgs,
-  ...
+    "git@${domain}:".insteadOf = "ssh:${prefix}:";
   config,
-  ...
+    "git@${domain}:".insteadOf = "ssh:${prefix}:";
   ...
-  ...
+    "git@${domain}:".insteadOf = "ssh:${prefix}:";
 }: let
-  ...
+    "git@${domain}:".insteadOf = "ssh:${prefix}:";
   insteadOf = prefix: domain: {
-  ...
+    "git@${domain}:".insteadOf = "ssh:${prefix}:";
     "https://${domain}/".insteadOf = "${prefix}:";
-  ...
+    "git@${domain}:".insteadOf = "ssh:${prefix}:";
     "git@${domain}:".insteadOf = "ssh:${prefix}:";
-  ...
+    "git@${domain}:".insteadOf = "ssh:${prefix}:";
   };
-}: let
+  };
-}: let
+  };
 {
-}: let
+  };
   pkgs,
-}: let
+  };
   config,
-}: let
+  };
   ...
-}: let
+  };
 }: let
-}: let
+  };
   insteadOf = prefix: domain: {
-}: let
+    };
+  };
     "https://${domain}/".insteadOf = "${prefix}:";
+  insteadOf = prefix: domain: {
 }: let
+  };
     "git@${domain}:".insteadOf = "ssh:${prefix}:";
-}: let
+  };
   };
-  insteadOf = prefix: domain: {
+  key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAUxLwkJOlalAHTdkbh+m49XTZGKDqWz1o/o8OLmtQdX";
-  insteadOf = prefix: domain: {
+  key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAUxLwkJOlalAHTdkbh+m49XTZGKDqWz1o/o8OLmtQdX";
 {
-  insteadOf = prefix: domain: {
+  key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAUxLwkJOlalAHTdkbh+m49XTZGKDqWz1o/o8OLmtQdX";
   pkgs,
-  insteadOf = prefix: domain: {
+  key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAUxLwkJOlalAHTdkbh+m49XTZGKDqWz1o/o8OLmtQdX";
   config,
-    difftastic = {
-  insteadOf = prefix: domain: {
+    "git@${domain}:".insteadOf = "ssh:${prefix}:";
 }: let
     };
     includes = [
diff --git a/apps/nogui/jj.nix b/apps/nogui/jj.nix
index 5d6b9f41e4004334dd33f73823e3f9c92809ccf4..ae1983ab9539368ff463ef7ec1fcf6d14d802561 100644
--- a/apps/nogui/jj.nix
+++ b/apps/nogui/jj.nix
@@ -4,7 +4,7 @@     enable = true;
     settings = {
       user = {
         name = "jolheiser";
-        email = "git@jolheiser.com";
+        email = "john@jolheiser.com";
       };
       ui = {
         diff.tool = ["${pkgs.difftastic}/bin/difft" "--color=always" "$left" "$right"];