diff --git a/hosts/gerg-desktop/git.nix b/hosts/gerg-desktop/git.nix
index bc50e7c..2aa1c1b 100644
--- a/hosts/gerg-desktop/git.nix
+++ b/hosts/gerg-desktop/git.nix
@@ -8,7 +8,6 @@ _:
       user = {
         name = "Gerg-L";
         email = "GregLeyda@proton.me";
-        signingkey = "~/.ssh/id_ed25519.pub";
       };
       init = {
         defaultBranch = "master";
@@ -18,7 +17,15 @@ _:
       };
       advice.addIgnoredFile = false;
       core.hooksPath = ".githooks";
-      gpg.format = "ssh";
+      gpg = {
+        format = "ssh";
+        ssh.defaultKeyCommand = pkgs.writeShellScript "git_key" ''
+          if ssh-add -L | grep -vq '${config.local.keys.gerg_gerg-desktop}'; then
+            ssh-add -t 1m ~/.ssh/id_ed25519
+          fi
+          echo 'key::${config.local.keys.gerg_gerg-desktop}'
+        '';
+      };
       push.gpgsign = "if-asked";
       commit.gpgsign = true;
     };
diff --git a/modules/misc.nix b/modules/misc.nix
index bbea972..04ac33d 100644
--- a/modules/misc.nix
+++ b/modules/misc.nix
@@ -47,6 +47,14 @@ _:
       };
     };
 
+    programs.ssh = {
+      startAgent = true;
+      agentTimeout = "1m";
+      extraConfig = ''
+        AddKeysToAgent yes
+      '';
+    };
+
     i18n.defaultLocale = "en_US.UTF-8";
     #time settings
 
diff --git a/modules/shell.nix b/modules/shell.nix
index 2d6f2a1..a0a79b3 100644
--- a/modules/shell.nix
+++ b/modules/shell.nix
@@ -49,6 +49,7 @@
     enable = true;
     execWheelOnly = true;
     extraConfig = ''
+      Defaults timestamp_timeout=1
       Defaults env_keep += "EDITOR VISUAL PAGER SYSTEMD_PAGERSECURE MANPAGER"
       Defaults lecture = never
     '';