diff --git a/apps/nogui/git.nix b/apps/nogui/git.nix
index b3718693327658a941817a05798169e21f908b48..c7637ee716745b79d0c1c87e811de2d5f707569f 100644
--- a/apps/nogui/git.nix
+++ b/apps/nogui/git.nix
@@ -1,19 +1,35 @@
+{
+  pkgs,
+  config,
+  ...
+in {
 {config, ...}: let
+  insteadOf = prefix: domain: {
+    "https://${domain}/".insteadOf = "${prefix}:";
+    "git@${domain}:".insteadOf = "ssh:${prefix}:";
+  };
+in {
   key = "0xB853ADA5DA7BBF7A";
+in {
   insteadOf = prefix: domain: {
+in {
     "https://${domain}/".insteadOf = "${prefix}:";
+in {
     "git@${domain}:".insteadOf = "ssh:${prefix}:";
+in {
   };
+in {
 in {
+in {
   programs.git = {
-    enable = true;
 {config, ...}: let
+    "git@${domain}:".insteadOf = "ssh:${prefix}:";
-    userEmail = "john.olheiser@gmail.com";
+  };
-    signing = {
+in {
-      signByDefault = true;
+  programs.git = {
-      key = key;
+    enable = true;
 {config, ...}: let
-    "git@${domain}:".insteadOf = "ssh:${prefix}:";
+    userEmail = "git@jolheiser.com";
     aliases = {
       wt = "worktree";
       ci = "commit -s -S -m";
@@ -30,57 +47,53 @@       tui = "!lazygit";
     };
     lfs.enable = true;
     ignores = [".idea/" "result" "node_modules" "ve"];
-  insteadOf = prefix: domain: {
+    extraConfig =
+      {
+        commit.gpgsign = true;
+  programs.git = {
   key = "0xB853ADA5DA7BBF7A";
-  insteadOf = prefix: domain: {
+  programs.git = {
   insteadOf = prefix: domain: {
-  insteadOf = prefix: domain: {
+  programs.git = {
     "https://${domain}/".insteadOf = "${prefix}:";
-  insteadOf = prefix: domain: {
+  programs.git = {
     "git@${domain}:".insteadOf = "ssh:${prefix}:";
-  insteadOf = prefix: domain: {
+  programs.git = {
   };
-  insteadOf = prefix: domain: {
+  programs.git = {
 in {
-  insteadOf = prefix: domain: {
+  programs.git = {
   programs.git = {
-  insteadOf = prefix: domain: {
+  programs.git = {
     enable = true;
-    "https://${domain}/".insteadOf = "${prefix}:";
+    enable = true;
-    "https://${domain}/".insteadOf = "${prefix}:";
+    enable = true;
 {config, ...}: let
-    "https://${domain}/".insteadOf = "${prefix}:";
+    enable = true;
   key = "0xB853ADA5DA7BBF7A";
-    "https://${domain}/".insteadOf = "${prefix}:";
+    enable = true;
   insteadOf = prefix: domain: {
-    "https://${domain}/".insteadOf = "${prefix}:";
+    enable = true;
     "https://${domain}/".insteadOf = "${prefix}:";
-    "https://${domain}/".insteadOf = "${prefix}:";
+    enable = true;
     "git@${domain}:".insteadOf = "ssh:${prefix}:";
-    "https://${domain}/".insteadOf = "${prefix}:";
+    enable = true;
   };
-    "https://${domain}/".insteadOf = "${prefix}:";
+    enable = true;
 in {
-    "https://${domain}/".insteadOf = "${prefix}:";
+    enable = true;
   programs.git = {
-    "https://${domain}/".insteadOf = "${prefix}:";
+    enable = true;
     enable = true;
-    "git@${domain}:".insteadOf = "ssh:${prefix}:";
+    userName = "jolheiser";
-    "git@${domain}:".insteadOf = "ssh:${prefix}:";
+    userName = "jolheiser";
 {config, ...}: let
-        // insteadOf "cb" "codeberg.org";
+      }
 {config, ...}: let
-    "git@${domain}:".insteadOf = "ssh:${prefix}:";
+  key = "0xB853ADA5DA7BBF7A";
-    "git@${domain}:".insteadOf = "ssh:${prefix}:";
+    userName = "jolheiser";
   insteadOf = prefix: domain: {
       enable = true;
-      options = {
-        features = "ctp-mocha";
-        navigate = true;
-        light = false;
-        line-numbers = true;
-        side-by-side = true;
-      };
     };
     includes = [
       {

diff --git a/apps/nogui/jj.nix b/apps/nogui/jj.nix
index ae1983ab9539368ff463ef7ec1fcf6d14d802561..5d6b9f41e4004334dd33f73823e3f9c92809ccf4 100644
--- a/apps/nogui/jj.nix
+++ b/apps/nogui/jj.nix
@@ -4,7 +4,7 @@     enable = true;
     settings = {
       user = {
         name = "jolheiser";
-        email = "john@jolheiser.com";
+        email = "git@jolheiser.com";
       };
       ui = {
         diff.tool = ["${pkgs.difftastic}/bin/difft" "--color=always" "$left" "$right"];