diff --git a/cherrykitten.pgp b/cherrykitten.pgp
new file mode 100644
index 0000000..efd90ac
--- /dev/null
+++ b/cherrykitten.pgp
@@ -0,0 +1,42 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+wv+ibcJ44mu+QLb9rYECbLmkkST2m4z2L1kK
+=6FuB
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/users/common/fish/default.nix b/users/common/fish/default.nix
index 2fbbdcb..122eb66 100644
--- a/users/common/fish/default.nix
+++ b/users/common/fish/default.nix
@@ -6,11 +6,9 @@
       set -g fish_greeting
       set -g fish_key_bindings fish_vi_key_bindings
 
-      set -e SSH_AUTH_SOCK
-      set -U -x SSH_AUTH_SOCK (gpgconf --list-dirs agent-ssh-socket)
       set -x GPG_TTY (tty)
       gpgconf --launch gpg-agent
-
+      gpg-connect-agent updatestartuptty /bye > /dev/null
     '';
 
     shellAliases = {
diff --git a/users/sammy.nix b/users/sammy.nix
index cde0e2e..1c9041c 100644
--- a/users/sammy.nix
+++ b/users/sammy.nix
@@ -14,4 +14,15 @@
   home.sessionVariables = {
     EDITOR = "nvim";
   };
+
+  programs.gpg = {
+    enable = true;
+    publicKeys = [
+      {
+        source = ../cherrykitten.pgp;
+        trust = "ultimate";
+      }
+
+    ];
+  };
 }