diff --git a/home/git-ssh.nix b/home/git-ssh.nix
index 4c0851e..790395f 100644
--- a/home/git-ssh.nix
+++ b/home/git-ssh.nix
@@ -4,53 +4,70 @@
 	  userName = "janis";
 	  userEmail = "janis@nirgendwo.xyz";
 
+	  signing = {
+	    format = "ssh";
+	    key = "~/.ssh/duralumin_janis-github";
+	  };
+
     extraConfig = {
       init = {
         defaultBranch = "main";
       };
+      safe = {
+        directory = "/etc/nixos/config";
+      };
+      commit = {
+        gpgsign = "true";
+      };
     };
   };
 
   programs.ssh = {
-    addKeysToAgent = "yes";
     enable = true;
     matchBlocks = {
       "git.nirgendwo.xyz" = {
         host = "git.nirgendwo.xyz";
         hostname = "git.nirgendwo.xyz";
         identityFile = "~/.ssh/id_ed25519_nirgendwo";
+        addKeysToAgent = "yes";
       };
       "nirgendwo.xyz" = {
         host = "nirgendwo.xyz";
         hostname = "nirgendwo.xyz";
         identityFile = "~/.ssh/id_ed25519_nirgendwo";
+        addKeysToAgent = "yes";
       };
       "nirgendswo.com" = {
         host = "nirgendswo.com";
         hostname = "nirgendswo.com";
         identityFile = "~/.ssh/id_ed25519_nirgendwo";
+        addKeysToAgent = "yes";
       };
       "nirgendwo" = {
         host = "nirgendwo";
         hostname = "nirgendwo.xyz";
         user = "root";
         identityFile = "~/.ssh/id_ed25519_nirgendwo";
+        addKeysToAgent = "yes";
       };
       "github.com:janis-bhm" = {
         host = "github.com:janis-bhm";
         hostname = "github.com";
         identityFile = "~/.ssh/duralumin_janis-github";
+        addKeysToAgent = "yes";
       };
-      "github-janis-bhm" = {
-        host = "github.com:janis-bhm";
+      "github-janis" = {
+        host = "github-janis";
         hostname = "github.com";
         user = "git";
-        identityFile = "~/.ssh/id_ed25519_github_janis";
+        identityFile = "~/.ssh/duralumin_janis-github";
+        addKeysToAgent = "yes";
       };
       "noonebtw.github.com" = {
         host = "noonebtw.github.com";
         hostname = "github.com";
         identityFile = "~/.ssh/id_ed25519_git";
+        addKeysToAgent = "yes";
       };
     };
   };