From 2441be2ad02fc28b397f67b704f2b41de7a96ed6 Mon Sep 17 00:00:00 2001 From: Aaron Honeycutt Date: Fri, 5 Sep 2025 13:35:34 -0600 Subject: [PATCH] fix: avoid hardcoding keyring daemon path for distros like NixOS --- data/start-cosmic | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/data/start-cosmic b/data/start-cosmic index bb09632..f723d5e 100755 --- a/data/start-cosmic +++ b/data/start-cosmic @@ -47,10 +47,15 @@ fi # -> check if /run/user/$UID/keyring exists if [ -d "/run/user/$(id -u)/keyring" ]; then - # start pkcs11, secrets, and ssh components - /usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh - export SSH_AUTH_SOCK="/run/user/$(id -u)/keyring/ssh" + # Use PATH lookup instead of hardcoding /usr/bin + if command -v gnome-keyring-daemon >/dev/null 2>&1; then + eval "$(gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)" + else + echo "gnome-keyring-daemon not found in PATH" >&2 + fi + # Set SSH_AUTH_SOCK to the standard gnome-keyring socket + export SSH_AUTH_SOCK="/run/user/$(id -u)/keyring/ssh" fi # Run cosmic-session