From 457ade4f014285d47fec229c5210af752f5be7e4 Mon Sep 17 00:00:00 2001 From: John Britton Date: Thu, 5 Oct 2023 14:45:56 -0400 Subject: [PATCH 1/3] python: Remove pyenv init woraround for pyenv >= 2.3.0 The startup logic and instructions have been updated for simplicity in pyenv 2.3.0. The workaround for pyenv init is no longer necessary. Signed-off-by: Indrajit Raychaudhuri --- modules/python/init.zsh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/modules/python/init.zsh b/modules/python/init.zsh index ce2fc69..c303cad 100644 --- a/modules/python/init.zsh +++ b/modules/python/init.zsh @@ -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 From 347441abdf9ea16cf4ea9306ea78f38af41e6667 Mon Sep 17 00:00:00 2001 From: Abizer Lokhandwala Date: Mon, 6 Nov 2023 12:35:24 -0800 Subject: [PATCH 2/3] remove alias sl='ls' --- modules/utility/README.md | 1 - modules/utility/init.zsh | 1 - 2 files changed, 2 deletions(-) diff --git a/modules/utility/README.md b/modules/utility/README.md index 142b1ea..78a7555 100644 --- a/modules/utility/README.md +++ b/modules/utility/README.md @@ -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 diff --git a/modules/utility/init.zsh b/modules/utility/init.zsh index 7e2e14e..e10c4fe 100644 --- a/modules/utility/init.zsh +++ b/modules/utility/init.zsh @@ -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). From f04191aa8ae475cf71f491830d424226d84501c9 Mon Sep 17 00:00:00 2001 From: Nobuhiro Takaichi Date: Sat, 23 Sep 2023 22:48:41 +0900 Subject: [PATCH 3/3] feat: Update submodules to avoid error with using zsh 5.9 --- modules/autosuggestions/external | 2 +- modules/completion/external | 2 +- modules/fasd/external | 2 +- modules/prompt/external/async | 2 +- modules/prompt/external/powerlevel10k | 2 +- modules/syntax-highlighting/external | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/autosuggestions/external b/modules/autosuggestions/external index a411ef3..c3d4e57 160000 --- a/modules/autosuggestions/external +++ b/modules/autosuggestions/external @@ -1 +1 @@ -Subproject commit a411ef3e0992d4839f0732ebeb9823024afaaaa8 +Subproject commit c3d4e576c9c86eac62884bd47c01f6faed043fc5 diff --git a/modules/completion/external b/modules/completion/external index 67921bc..c0fe16f 160000 --- a/modules/completion/external +++ b/modules/completion/external @@ -1 +1 @@ -Subproject commit 67921bc12502c1e7b0f156533fbac2cb51f6943d +Subproject commit c0fe16fdadfc8fa8e26247e467bf09aeb7f3b4ca diff --git a/modules/fasd/external b/modules/fasd/external index 4822024..90b531a 160000 --- a/modules/fasd/external +++ b/modules/fasd/external @@ -1 +1 @@ -Subproject commit 48220241e764fdf46b075cd7fe723468aaadde58 +Subproject commit 90b531a5daaa545c74c7d98974b54cbdb92659fc diff --git a/modules/prompt/external/async b/modules/prompt/external/async index a66d76f..ee1d11b 160000 --- a/modules/prompt/external/async +++ b/modules/prompt/external/async @@ -1 +1 @@ -Subproject commit a66d76f8404bd9e7a26037640e6c892cf5871ff4 +Subproject commit ee1d11b68c38dec24c22b1c51a45e8a815a79756 diff --git a/modules/prompt/external/powerlevel10k b/modules/prompt/external/powerlevel10k index 017395a..873c4ff 160000 --- a/modules/prompt/external/powerlevel10k +++ b/modules/prompt/external/powerlevel10k @@ -1 +1 @@ -Subproject commit 017395a266aa15011c09e64e44a1c98ed91c478c +Subproject commit 873c4ff09c559a507d33e528df7e27a8a48705d7 diff --git a/modules/syntax-highlighting/external b/modules/syntax-highlighting/external index 932e29a..143b25e 160000 --- a/modules/syntax-highlighting/external +++ b/modules/syntax-highlighting/external @@ -1 +1 @@ -Subproject commit 932e29a0c75411cb618f02995b66c0a4a25699bc +Subproject commit 143b25eb98aa3227af63bd7f04413e1b3e7888ec