From b81ca9703b30fc4ee07182f2835c7f5c9e3113bf Mon Sep 17 00:00:00 2001
From: David Tomaschik <david@systemoverlord.com>
Date: Tue, 30 Jun 2026 12:24:00 -0700
Subject: [PATCH] Fix broken shenv merge

---
 dotfiles/shenv | 40 ----------------------------------------
 1 file changed, 40 deletions(-)

diff --git a/dotfiles/shenv b/dotfiles/shenv
index 44314e4..3b69a25 100755
--- a/dotfiles/shenv
+++ b/dotfiles/shenv
@@ -210,8 +210,6 @@ _CANDIDATE=""
 # rewrites it to the stable symlink; the shell inherits the original raw path).
 if ! _is_link_path "${SSH_AUTH_SOCK:-}" && _is_valid_ssh_sock "${SSH_AUTH_SOCK:-}"; then
   _CANDIDATE="${SSH_AUTH_SOCK}"
-  export ORIG_SSH_AUTH_SOCK
-  ORIG_SSH_AUTH_SOCK="${SSH_AUTH_SOCK}"
 fi
 
 # 2. Only look for a system agent if the stable link is already broken. If the link is
@@ -221,44 +219,6 @@ if [ -z "${_CANDIDATE}" ] && ! _is_valid_ssh_sock "${_SSH_AUTH_LINK}"; then
   _CANDIDATE=$(get_local_ssh_agent_sock)
 fi
 
-# 3. Last resort: search common paths if we still don't have a candidate and the link is broken.
-if [ ! -S "${_CANDIDATE}" ] && [ ! -S "${_SSH_AUTH_LINK}" ]; then
-  _U=$(id -u)
-  for _p in "/run/user/${_U}/keyring/ssh" "/run/user/${_U}/ssh-agent.socket" "/run/user/${_U}/openssh_agent" "/run/user/${_U}/gnupg/S.gpg-agent.ssh"; do
-    if [ -S "${_p}" ] && ! _is_link_path "${_p}"; then
-      _CANDIDATE="${_p}"
-      break
-    fi
-  done
-  if [ -z "${_CANDIDATE}" ]; then
-    # Build search path list based on what actually exists
-    _SEARCH=""
-    for _d in "/run/user/${_U}" /tmp; do [ -d "${_d}" ] && _SEARCH="${_SEARCH} ${_d}"; done
-    if [ -n "${_SEARCH}" ]; then
-      _CANDIDATE=$(find "${_SEARCH}" -maxdepth 2 -type s -name 'agent.*' 2>/dev/null | grep -F -v "${_SSH_AUTH_LINK}" | head -n 1)
-    fi
-  fi
-fi
-
-# 3. Last resort: search common paths if we still don't have a candidate and the link is broken.
-if [ ! -S "${_CANDIDATE}" ] && [ ! -S "${_SSH_AUTH_LINK}" ]; then
-  _U=$(id -u)
-  for _p in "/run/user/${_U}/keyring/ssh" "/run/user/${_U}/ssh-agent.socket" "/run/user/${_U}/openssh_agent" "/run/user/${_U}/gnupg/S.gpg-agent.ssh"; do
-    if [ -S "${_p}" ] && ! _is_link_path "${_p}"; then
-      _CANDIDATE="${_p}"
-      break
-    fi
-  done
-  if [ -z "${_CANDIDATE}" ]; then
-    # Build search path list based on what actually exists
-    _SEARCH=""
-    for _d in "/run/user/${_U}" /tmp; do [ -d "${_d}" ] && _SEARCH="${_SEARCH} ${_d}"; done
-    if [ -n "${_SEARCH}" ]; then
-      _CANDIDATE=$(find ${_SEARCH} -maxdepth 2 -type s -name 'agent.*' 2>/dev/null | grep -F -v "${_SSH_AUTH_LINK}" | head -n 1)
-    fi
-  fi
-fi
-
 # 3. Sync the stable link if we found a valid "real" socket.
 if [ -n "${_CANDIDATE}" ] && ! _is_link_path "${_CANDIDATE}" && _is_valid_ssh_sock "${_CANDIDATE}"; then
   mkdir -p "$(dirname "${_SSH_AUTH_LINK}")"