b925431025
* Give SSH commands the user-level tool paths
ssh host cmd runs neither a login nor an interactive shell, so on Arch it
gets the bare sshd PATH and can't find mise-managed tools like the agent
CLIs herdr scans for. Set PATH in the PAM environment (per-user via
@{HOME}), append the user-level dirs in env-bootstrap so login shells and
the uwsm session get them too, and source env-bootstrap before bashrc's
interactive guard for bash variants that read it non-interactively.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
* Don't let an empty PATH turn into a cwd entry
Appending with a bare "$PATH:" prefix leaves a leading colon when PATH
is unset, which shells treat as the current directory.
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---------
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
42 lines
1.6 KiB
Plaintext
42 lines
1.6 KiB
Plaintext
# Single source of truth for OMARCHY_PATH + PATH adjustments. Sourced by:
|
|
# /etc/profile.d/omarchy.sh (system login shells)
|
|
# /etc/skel/.bashrc (interactive shells)
|
|
# /usr/share/uwsm/env.d/10-omarchy (Hyprland session via uwsm)
|
|
# /usr/share/omarchy/default/bash/envs (bash rc chain; SSH/non-login)
|
|
|
|
# /etc/omarchy.conf is written by omarchy-dev-link and reset by
|
|
# omarchy-dev-unlink. When absent, force the packaged default instead of
|
|
# preserving a stale inherited value.
|
|
if [ -f /etc/omarchy.conf ]; then
|
|
. /etc/omarchy.conf
|
|
: "${OMARCHY_PATH:=/usr/share/omarchy}"
|
|
else
|
|
OMARCHY_PATH=/usr/share/omarchy
|
|
fi
|
|
export OMARCHY_PATH
|
|
|
|
# Only prepend in dev-link mode. On a production install, the binaries are
|
|
# already on PATH as /usr/bin/omarchy-* via the omarchy package — prepending
|
|
# /usr/share/omarchy/bin would just be noise.
|
|
if [ "$OMARCHY_PATH" != /usr/share/omarchy ]; then
|
|
case ":$PATH:" in
|
|
*":${OMARCHY_PATH%/}/bin:"*) ;;
|
|
*) PATH="${OMARCHY_PATH%/}/bin${PATH:+:$PATH}" ;;
|
|
esac
|
|
fi
|
|
|
|
# User-level tool paths, appended so system binaries keep precedence. This is
|
|
# what lets login shells (ssh, bash -lc) and the uwsm session find mise-managed
|
|
# tools without an interactive rc. Keep these directories in sync with the PAM
|
|
# PATH line from install/config/ssh-command-path.sh, which covers SSH commands
|
|
# that run no shell setup at all.
|
|
case ":$PATH:" in
|
|
*":$HOME/.local/share/mise/shims:"*) ;;
|
|
*) PATH="${PATH:+$PATH:}$HOME/.local/share/mise/shims" ;;
|
|
esac
|
|
case ":$PATH:" in
|
|
*":$HOME/.local/bin:"*) ;;
|
|
*) PATH="${PATH:+$PATH:}$HOME/.local/bin" ;;
|
|
esac
|
|
export PATH
|