mirror of
https://github.com/dcarrillo/prezto.git
synced 2024-12-22 02:18:01 +00:00
Merge upstream/master
This commit is contained in:
commit
335311ba21
@ -1 +1 @@
|
||||
Subproject commit a411ef3e0992d4839f0732ebeb9823024afaaaa8
|
||||
Subproject commit c3d4e576c9c86eac62884bd47c01f6faed043fc5
|
@ -1 +1 @@
|
||||
Subproject commit 67921bc12502c1e7b0f156533fbac2cb51f6943d
|
||||
Subproject commit c0fe16fdadfc8fa8e26247e467bf09aeb7f3b4ca
|
@ -1 +1 @@
|
||||
Subproject commit 48220241e764fdf46b075cd7fe723468aaadde58
|
||||
Subproject commit 90b531a5daaa545c74c7d98974b54cbdb92659fc
|
2
modules/prompt/external/async
vendored
2
modules/prompt/external/async
vendored
@ -1 +1 @@
|
||||
Subproject commit a66d76f8404bd9e7a26037640e6c892cf5871ff4
|
||||
Subproject commit ee1d11b68c38dec24c22b1c51a45e8a815a79756
|
2
modules/prompt/external/powerlevel10k
vendored
2
modules/prompt/external/powerlevel10k
vendored
@ -1 +1 @@
|
||||
Subproject commit 017395a266aa15011c09e64e44a1c98ed91c478c
|
||||
Subproject commit 873c4ff09c559a507d33e528df7e27a8a48705d7
|
@ -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
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 932e29a0c75411cb618f02995b66c0a4a25699bc
|
||||
Subproject commit 143b25eb98aa3227af63bd7f04413e1b3e7888ec
|
@ -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).
|
||||
|
Loading…
Reference in New Issue
Block a user