dcarrillo
/
prezto
mirror of https://github.com/dcarrillo/prezto.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge upstream/master

This commit is contained in:
Daniel Carrillo 2022-03-05 16:27:27 +01:00
parent a96f1618b4 7ec1ecde3a
commit 74d4100434
3 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/prompt/external/powerlevel10k vendored

@ -1 +1 @@
Subproject commit f5d61840ae3a4f8c2765e1a67d94d9a96de71601
Subproject commit 8a676a9157d2b0e00e88d06456ac7317f11c0317

2
modules/prompt/external/pure vendored

@ -1 +1 @@
Subproject commit 2e354b80deae105ea246699c49e65dcd4fe8b759
Subproject commit 5b458ba5b75f49a8071d53c343f1a23631f7bced

45
modules/python/init.zsh
View File

@ -114,33 +114,34 @@ if (( $+VIRTUALENVWRAPPER_VIRTUALENV || $+commands[virtualenv] )) \
pyenv_plugins=(${(@oM)${(f)"$(pyenv commands --no-sh 2> /dev/null)"}:#virtualenv*})
fi
# Optionally activate 'virtualenv' plugin when available.
if (( $pyenv_plugins[(i)virtualenv-init] <= $#pyenv_plugins )); then
# Enable 'virtualenv' with 'pyenv'.
eval "$(pyenv virtualenv-init - zsh)"
# Optionally activate 'virtualenvwrapper' plugin when available.
if (( $pyenv_plugins[(i)virtualenvwrapper(_lazy|)] <= $#pyenv_plugins )); then
pyenv "$pyenv_plugins[(R)virtualenvwrapper(_lazy|)]"
fi
else
# Fallback to 'virtualenvwrapper' without 'pyenv' wrapper if 'python' is
# available in '$path'.
if (( ! $+VIRTUALENVWRAPPER_PYTHON )) && (( $#commands[(i)python[23]#] )); then
VIRTUALENVWRAPPER_PYTHON=$commands[(i)python[23]#]
fi
virtenv_sources=(
${(@Ov)commands[(I)virtualenvwrapper(_lazy|).sh]}
/usr/share/virtualenvwrapper/virtualenvwrapper(_lazy|).sh(OnN)
)
if (( $#virtenv_sources )); then
source "$virtenv_sources[1]"
fi
unset virtenv_sources
fi
# Optionally activate 'virtualenvwrapper' plugin when available.
if (( $pyenv_plugins[(i)virtualenvwrapper(_lazy|)] <= $#pyenv_plugins )); then
pyenv "$pyenv_plugins[(R)virtualenvwrapper(_lazy|)]"
fi
unset pyenv_plugins
else
# Fallback to 'virtualenvwrapper' without 'pyenv' wrapper if 'python' is
# available in '$path'.
if (( ! $+VIRTUALENVWRAPPER_PYTHON )) && (( $#commands[(i)python[23]#] )); then
VIRTUALENVWRAPPER_PYTHON=$commands[(i)python[23]#]
fi
virtenv_sources=(
${(@Ov)commands[(I)virtualenvwrapper(_lazy|).sh]}
/usr/share/virtualenvwrapper/virtualenvwrapper(_lazy|).sh(OnN)
)
if (( $#virtenv_sources )); then
source "$virtenv_sources[1]"
fi
unset virtenv_sources
fi
# Load conda into the shell session, if requested.