diff --git a/config.nix b/config.nix
index 1548d6fe45ea87008731fbd0e0e50ce6b58ec622..17110a96d9dbce0aebf8ee7d46db2d8e06224869 100644
--- a/config.nix
+++ b/config.nix
@@ -14,9 +14,4 @@   catppuccin = {
     flavor = "mocha";
     accent = "lavender";
   };
-  git = {
-    username = "jolheiser";
-    email = "git@jolheiser.com";
-    sshKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAUxLwkJOlalAHTdkbh+m49XTZGKDqWz1o/o8OLmtQdX";
-  };
 }
diff --git a/home/nogui/git.nix b/home/nogui/git.nix
index 65eb46a8aa6e10f96d13c1a7a265b998b6aa7953..85699056418ee4e3946a31afccae8b3af8ec5c8b 100644
--- a/home/nogui/git.nix
+++ b/home/nogui/git.nix
@@ -1,21 +1,17 @@
-{
-  pkgs,
-  config,
-  jolheiser,
-  ...
-}:
+{ pkgs, config, ... }:
 let
   insteadOf = prefix: domain: {
     "https://${domain}/".insteadOf = "${prefix}:";
     "git@${domain}:".insteadOf = "ssh:${prefix}:";
   };
+  key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAUxLwkJOlalAHTdkbh+m49XTZGKDqWz1o/o8OLmtQdX";
   sshSigning = {
-    user.signingkey = jolheiser.git.sshKey;
+    user.signingkey = key;
     commit.gpgSign = true;
     tag.gpgSign = true;
     gpg = {
       format = "ssh";
-      ssh.allowedSignersFile = "${pkgs.writeText "allowedSigners" "${jolheiser.git.email} ${jolheiser.git.sshKey}"}";
+      ssh.allowedSignersFile = "${pkgs.writeText "allowedSigners" "git@jolheiser.com ${key}"}";
     };
   };
 in
@@ -23,8 +19,8 @@ {
   age.secrets.git-send-email.file = ../../secrets/git-send-email.age;
   programs.git = {
     enable = true;
-    userName = jolheiser.git.username;
-    userEmail = jolheiser.git.email;
+    userName = "jolheiser";
+    userEmail = "git@jolheiser.com";
     aliases = {
       wt = "worktree";
       ci = "commit -s -S -m";
diff --git a/home/nogui/jj.nix b/home/nogui/jj.nix
index 36e8a5c01e1d56fccdaffd49dca539b0247c2f8e..baac13ee18764603ddb355dfad536a095392f2fd 100644
--- a/home/nogui/jj.nix
+++ b/home/nogui/jj.nix
@@ -1,11 +1,11 @@
-{ pkgs, jolheiser, ... }:
+{ pkgs, ... }:
 {
   programs.jujutsu = {
     enable = true;
     settings = {
       user = {
-        name = jolheiser.git.username;
-        email = jolheiser.git.email;
+        name = "jolheiser";
+        email = "git@jolheiser.com";
       };
       ui = {
         diff-formatter = [
@@ -17,7 +17,6 @@         ];
         editor = "hx";
         paginate = "never";
         default-command = "status";
-        show-cryptographic-signatures = true;
       };
       templates = {
         git_push_bookmark = ''"change/" ++ change_id.short()'';
@@ -33,14 +32,10 @@             diff.git(),
           )
         '';
       };
-      template-aliases = {
-        "format_timestamp(timestamp)" = "timestamp.ago()";
-      };
       signing = {
         behavior = "own";
         backend = "ssh";
-        key = jolheiser.git.sshKey;
-        backends.ssh.allowed-signers = "${pkgs.writeText "allowedSigners" "${jolheiser.git.email} ${jolheiser.git.sshKey}"}";
+        key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAUxLwkJOlalAHTdkbh+m49XTZGKDqWz1o/o8OLmtQdX";
       };
       revsets.log = "ancestors(present(@), 5) | ancestors(immutable_heads().., 2) | present(trunk())";
       revset-aliases = {