diff --git a/home/fhauser/applications/gpg.nix b/home/fhauser/applications/gpg.nix
index a2228c2..69e466e 100644
--- a/home/fhauser/applications/gpg.nix
+++ b/home/fhauser/applications/gpg.nix
@@ -1,6 +1,5 @@
 { pkgs, pkgsUnstable, ... }: {
   #TODO: ENV variabls for agent
-  home.sessionVariables.SSH_AUTH_SOCK = "/run/user/1000/gnupg/S.gpg-agent.ssh";
   programs.gpg = {
     enable = true;
     package = pkgsUnstable.gnupg;
diff --git a/home/fhauser/applications/ssh.nix b/home/fhauser/applications/ssh.nix
index 00b4f29..fb603de 100644
--- a/home/fhauser/applications/ssh.nix
+++ b/home/fhauser/applications/ssh.nix
@@ -21,6 +21,9 @@
       };
       "github.com" = forceIdentityPrivate // { user = "git"; };
     };
+    extraConfig = ''
+      IdentityAgent /run/user/1000/gnupg/S.gpg-agent.ssh
+    '';
     #TODO: Authorized keys implementation, see https://github.com/nix-community/home-manager/pull/9
   };
 }
diff --git a/home/fhauser/applications/sway.nix b/home/fhauser/applications/sway.nix
index 6a1bc78..cacbf11 100644
--- a/home/fhauser/applications/sway.nix
+++ b/home/fhauser/applications/sway.nix
@@ -36,7 +36,6 @@ in rec {
       export XDG_CURRENT_DESKTOP=sway
       export XDG_SESSION_TYPE="wayland"
       export _JAVA_AWT_WM_NONREPARENTING=1
-      export SSH_AUTH_SOCK=/run/user/1000/gnupg/S.gpg-agent.ssh # TODO: Migrate
       export QT_QPA_PLATFORM=wayland
       export QT_WAYLAND_DISABLE_WINDOWDECORATION="1"
       # TODO: QTpie