fix(pivy): Set SSH_AUTH_SOCK

aiotter · Jan 17, 2024 · ea7ccb2 · ea7ccb2
1 parent 5fc5fcf
commit ea7ccb2
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 23 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/modules/pivy-agent/default.nix b/modules/pivy-agent/default.nix
@@ -40,6 +40,10 @@ in
 
     # programs.ssh.extraOptionOverrides.IdentityAgent = cfg.socket;
 
-    programs.bash.profileExtra = "export SSH_AUTH_SOCK=\${SSH_AUTH_SOCK:-${cfg.socket}}";
+    programs.bash.profileExtra = ''
+      if [[ ! -e "$SSH_AUTH_SOCK" || "$SSH_AUTH_SOCK" == *${if pkgs.stdenv.isDarwin then "launchd" else "/keyring/"}* ]]; then
+        export SSH_AUTH_SOCK="${cfg.socket}"
+      fi
+    '';
   };
 }