diff --git a/users/buffet/default.nix b/users/buffet/default.nix
index 0b88e82..68e31f1 100644
--- a/users/buffet/default.nix
+++ b/users/buffet/default.nix
@@ -11,7 +11,6 @@
     ./foot.nix
     ./fzf.nix
     ./git.nix
-    ./gpg.nix
     ./ime.nix
     ./mako.nix
     ./nvd.nix
diff --git a/users/buffet/gpg.nix b/users/buffet/gpg.nix
deleted file mode 100644
index 0b0f914..0000000
--- a/users/buffet/gpg.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  home-manager.users.buffet = {
-    programs.gpg.enable = true;
-  };
-}
diff --git a/users/buffet/ssh.nix b/users/buffet/ssh.nix
index 538740d..afa1c6a 100644
--- a/users/buffet/ssh.nix
+++ b/users/buffet/ssh.nix
@@ -2,6 +2,7 @@
   home-manager.users.buffet = {
     programs.ssh = {
       enable = true;
+      addKeysToAgent = "10m";
       extraConfig = ''
         Host kitchen
           Hostname buffets.kitchen
@@ -9,5 +10,9 @@
           IdentityFile ~/.ssh/id_buffet_ecdsa
       '';
     };
+
+    services.ssh-agent = {
+      enable = true;
+    };
   };
 }