From 09d2901003920e1551584e88918b6831e28cb388 Mon Sep 17 00:00:00 2001
From: Bloxx12 <charlie@charlieroot.dev>
Date: Sat, 12 Apr 2025 10:02:21 +0200
Subject: [PATCH] ssh: set SSH_AUTH_SOCK systemwide

---
 modules/services/ssh.nix   | 7 +++----
 packages/shell/default.nix | 1 -
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/modules/services/ssh.nix b/modules/services/ssh.nix
index bca460c..248d54b 100644
--- a/modules/services/ssh.nix
+++ b/modules/services/ssh.nix
@@ -3,11 +3,10 @@
 in {
   options.modules.programs.ssh.enable = mkEnableOption "ssh";
   config = {
+    # set the ssh socket globally. This alows all applications and shells to use
+    # the ssh-agent.
+    environment.sessionVariables.SSH_AUTH_SOCK = "/run/user/1000/ssh-agent";
     programs.ssh.startAgent = true;
-    # programs.ssh.pubkeyAcceptedKeyTypes = [
-    #   "ssh-rsa"
-    #   "ecdsa-sha2-nistp521"
-    # ];
 
     services.openssh = {
       enable = true;
diff --git a/packages/shell/default.nix b/packages/shell/default.nix
index 6408291..94dbc91 100644
--- a/packages/shell/default.nix
+++ b/packages/shell/default.nix
@@ -28,7 +28,6 @@ in
     buildInputs = [pkgs.makeWrapper];
     postBuild = ''
       wrapProgram $out/bin/fish --set STARSHIP_CONFIG "${toml.generate "starship.toml" starship-config}" \
-      --set SSH_AUTH_SOCK /run/user/1000/ssh-agent \
     '';
   })
   .overrideAttrs (_: {