diff --git a/users/common/fish/default.nix b/users/common/fish/default.nix
index 1c4eef9..2fbbdcb 100644
--- a/users/common/fish/default.nix
+++ b/users/common/fish/default.nix
@@ -5,10 +5,12 @@
     interactiveShellInit = ''
       set -g fish_greeting
       set -g fish_key_bindings fish_vi_key_bindings
-      export GPG_TTY="$(tty)"
-      export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
+
+      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 = {