From 4c0f82b33de6da55df161521bc79b8acdd4c5e7e Mon Sep 17 00:00:00 2001
From: CherryKitten <sammy@cherrykitten.dev>
Date: Sun, 24 Mar 2024 20:05:07 +0100
Subject: [PATCH] nya

---
 users/common/fish/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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 = {