Skip to content

fix(shell): restore ZDOTDIR and source full zsh startup chain #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pld merged 2 commits into from
Apr 26, 2026
Merged

fix(shell): restore ZDOTDIR and source full zsh startup chain #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
faca67e
fix(shell): restore ZDOTDIR and source full zsh startup chain
ukanga Apr 21, 2026
743a422
Merge branch 'main' into fix/zsh-prezto-compdef-errors
pld Apr 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/shell.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,22 @@ if [[ -n "$_WT_ORIG_ZDOTDIR" ]] && [[ -f "$_WT_ORIG_ZDOTDIR/.zshrc" ]]; then
elif [[ -f "$HOME/.zshrc" ]]; then
source "$HOME/.zshrc"
fi
export ZDOTDIR

# Safety stub: prevents `compdef: command not found` when a startup file calls
# compdef before compinit runs. Real compdef overrides this once compinit loads.
(( $+functions[compdef] )) || compdef() { :; }

# Re-source startup files in normal order from the real ZDOTDIR/HOME, since
# zsh's own startup sourced them from the overridden temp ZDOTDIR (empty).
_wt_zdot="${ZDOTDIR:-$HOME}"
[[ -f "$_wt_zdot/.zshenv" ]] && source "$_wt_zdot/.zshenv"
if [[ -o login ]]; then
[[ -f "$_wt_zdot/.zprofile" ]] && source "$_wt_zdot/.zprofile"
fi
[[ -f "$_wt_zdot/.zshrc" ]] && source "$_wt_zdot/.zshrc"
unset _wt_zdot

# Add wt indicator to prompt
PROMPT="(wt) $PROMPT"
"#;
Expand Down
Loading