From 554e13cd366b307e115626e992a3ad777e1ecb4a Mon Sep 17 00:00:00 2001 From: Marty Oehme Date: Thu, 6 Mar 2025 21:16:58 +0100 Subject: [PATCH] river: Fix pass-pick invocation Running pass-pick (or other gpg requiring software) through river was not correctly accessing the gpg agent since being managed by runit user service did not point them to the correct gpg agent socket. This commit fixes it using keychain as auxiliary software to manage a session-long gpg agent process which is also exported into the turnstile environment so other runit services can make use of it. --- desktop/.config/river/init | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/desktop/.config/river/init b/desktop/.config/river/init index 1f142af..21dd169 100755 --- a/desktop/.config/river/init +++ b/desktop/.config/river/init @@ -4,6 +4,12 @@ if [ -d "$TURNSTILE_ENV_DIR" ]; then echo "$DISPLAY" >"$TURNSTILE_ENV_DIR/DISPLAY" echo "$WAYLAND_DISPLAY" >"$TURNSTILE_ENV_DIR/WAYLAND_DISPLAY" + echo "ADDING KEYCHAIN TO ENV" + keychain --eval --quiet --agents ssh,gpg C414FF88A557F29AFEF76C7E73BA40D5AFAF49C9 + echo "$SSH_AUTH_SOCK">"$TURNSTILE_ENV_DIR/SSH_AUTH_SOCK" + echo "$SSH_AGENT_PID">"$TURNSTILE_ENV_DIR/SSH_AGENT_PID" + echo "$GPG_AGENT_INFO">"$TURNSTILE_ENV_DIR/GPG_AGENT_INFO" + echo "DONE ADDING KEYCHAIN TO ENV" fi mod="Mod4"