1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-12-04 08:01:02 +01:00
home-manager/modules/services
Lucas Servén Marín 1fa73bb2cc
fix(service/gpg-agent): allow SSH ForwardAgent compatibility (#7355)
https://github.com/nix-community/home-manager/pull/7117#issuecomment-3018582819
noted that #7117 broke compatibility with forwarding ssh-agents using
`ssh -A`/`ForwardAgent`. In order to continue supporting the fix for
the issue raised in #5997 and address the compatibility problem
mentioned by @euank, this commit introduces the solution described in
https://github.com/nix-community/home-manager/pull/7117#issuecomment-3025001779.

The code now checks the following:
1. is this shell part of an SSH connection and is `SSH_AUTH_SOCK` set?
   if so, assume the socket variable was set by sshd to point at a
   forwarded socket; bail out to skip setting `SSH_AUTH_SOCK".
1. is the current process a child of `gpg-agent --daemon`? if so, then
   bail out to skip setting `SSH_AUTH_SOCK`.
1. if we got this far, then set `SSH_AUTH_SOCK`.

I've tested this fix locally and can confirm that both #5997 as well as
the regression are fixed.

Signed-off-by: squat <lserven@gmail.com>
2025-07-03 08:24:16 -05:00
..
imapnotify treewide: implement auto importing for modules 2025-06-22 23:58:37 -05:00
macos-remap-keys treewide: reformat nixfmt-rfc-style 2025-04-08 08:50:05 -07:00
podman-linux podman: use quadlet source from file drv (#7102) 2025-05-30 10:25:03 -05:00
redshift-gammastep treewide: implement auto importing for modules 2025-06-22 23:58:37 -05:00
window-managers sway: add wayland.windowManager.sway.systemd.dbusImplementation (#7271) 2025-06-29 18:09:58 -05:00
activitywatch.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
amberol.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
arrpc.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
autorandr.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
avizo.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
barrier.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
batsignal.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
betterlockscreen.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
blanket.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
blueman-applet.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
borgmatic.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
cachix-agent.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
caffeine.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
cbatticon.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
clipcat.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
cliphist.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
clipman.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
clipmenu.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
clipse.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
comodoro.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
conky.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
copyq.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
darkman.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
davmail.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
devilspie2.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
dropbox.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
dunst.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
dwm-status.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
easyeffects.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
emacs.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
espanso.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
etesync-dav.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
flameshot.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
fluidsynth.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
fnott.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
fusuma.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
getmail.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
git-sync.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
glance.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
gnome-keyring.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
gpg-agent.nix fix(service/gpg-agent): allow SSH ForwardAgent compatibility (#7355) 2025-07-03 08:24:16 -05:00
grobi.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
gromit-mpx.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
home-manager-auto-expire.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
home-manager-auto-upgrade.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
hound.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
hypridle.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
hyprpaper.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
hyprpolkitagent.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
hyprsunset.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
jankyborders.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
jellyfin-mpv-shim.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
kanshi.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
kbfs.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
kdeconnect.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
keybase.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
keynav.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
librespot.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
lieer.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
linux-wallpaperengine.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
listenbrainz-mpd.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
lorri.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
ludusavi.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
lxqt-policykit-agent.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
mako.nix mako: "settings" is an attrset, so use that as example too (#7330) 2025-06-26 16:36:45 -05:00
mbsync.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
megasync.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
mopidy.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
mpd-discord-rpc.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
mpd-mpris.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
mpd.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
mpdris2.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
mpdscribble.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
mpris-proxy.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
muchsync.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
network-manager-applet.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
nextcloud-client.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
nix-gc.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
notify-osd.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
ollama.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
opensnitch-ui.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
osmscout-server.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
owncloud-client.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
pantalaimon.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
parcellite.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
pass-secret-service.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
pasystray.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
pbgopy.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
picom.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
plan9port.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
playerctld.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
plex-mpv-shim.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
polkit-gnome.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
polybar.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
poweralertd.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
psd.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
pueue.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
pulseeffects.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
random-background.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
recoll.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
remmina.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
restic.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
rsibreak.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
safeeyes.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
screen-locker.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
sctd.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
shikane.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
signaturepdf.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
skhd.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
snixembed.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
spotifyd.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
ssh-agent.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
stalonetray.nix formatter: add deadnix (#7331) 2025-06-28 16:28:39 -05:00
status-notifier-watcher.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
swayidle.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
swaync.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
swayosd.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
swww.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
sxhkd.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
syncthing.nix syncthing: add guiAddress to configuration (#7281) 2025-06-29 18:11:18 -05:00
systembus-notify.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
taffybar.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
tahoe-lafs.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
taskwarrior-sync.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
tldr-update.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
trayer.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
trayscale.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
twmn.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
udiskie.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
unclutter.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
unison.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
vdirsyncer.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
volnoti.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
way-displays.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
wayvnc.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
wlsunset.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
wluma.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
wob.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
wpaperd.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
xcape.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
xembed-sni-proxy.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
xidlehook.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
xscreensaver.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
xsettingsd.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
xsuspender.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00
yubikey-agent.nix treewide: flatten single file modules 2025-06-23 16:20:26 -05:00