mirror of
https://github.com/dcarrillo/prezto.git
synced 2025-07-01 08:09:25 +00:00
Merge upstream/master
This commit is contained in:
Submodule modules/autosuggestions/external updated: a411ef3e09...c3d4e576c9
Submodule modules/completion/external updated: 67921bc125...c0fe16fdad
Submodule modules/fasd/external updated: 48220241e7...90b531a5da
2
modules/prompt/external/async
vendored
2
modules/prompt/external/async
vendored
Submodule modules/prompt/external/async updated: a66d76f840...ee1d11b68c
2
modules/prompt/external/powerlevel10k
vendored
2
modules/prompt/external/powerlevel10k
vendored
Submodule modules/prompt/external/powerlevel10k updated: 017395a266...873c4ff09c
@ -25,12 +25,7 @@ if [[ -s "${local_pyenv::=${PYENV_ROOT:-$HOME/.pyenv}/bin/pyenv}" ]] \
|
||||
# Ensure manually installed pyenv is added to path when present.
|
||||
[[ -s $local_pyenv ]] && path=($local_pyenv:h $path)
|
||||
|
||||
# pyenv 2+ requires shims to be added to path before being initialized.
|
||||
autoload -Uz is-at-least
|
||||
if is-at-least 2 ${"$(pyenv --version 2>&1)"[(w)2]}; then
|
||||
eval "$(pyenv init --path zsh)"
|
||||
fi
|
||||
|
||||
# Load pyenv into the shell session.
|
||||
eval "$(pyenv init - zsh)"
|
||||
|
||||
# Prepend PEP 370 per user site packages directory, which defaults to
|
||||
|
Submodule modules/syntax-highlighting/external updated: 932e29a0c7...143b25eb98
@ -140,7 +140,6 @@ zstyle ':prezto:module:utility' correct 'no'
|
||||
- `lt` lists sorted by date, most recent last.
|
||||
- `lc` lists sorted by date, most recent last, shows change time.
|
||||
- `lu` lists sorted by date, most recent last, shows access time.
|
||||
- `sl` lists directory contents (correction for `ls`).
|
||||
|
||||
### macOS Everywhere
|
||||
|
||||
|
@ -122,7 +122,6 @@ alias lk='ll -Sr' # Lists sorted by size, largest last.
|
||||
alias lt='ll -tr' # Lists sorted by date, most recent last.
|
||||
alias lc='lt -c' # Lists sorted by date, most recent last, shows change time.
|
||||
alias lu='lt -u' # Lists sorted by date, most recent last, shows access time.
|
||||
alias sl='ls' # Correction for common spelling error.
|
||||
|
||||
if [[ ${(@M)${(f)"$(ls --version 2>&1)"}:#*GNU *} ]]; then
|
||||
alias lx='ll -XB' # Lists sorted by extension (GNU only).
|
||||
|
Reference in New Issue
Block a user