From 7884fb2271d131bb492fafc4eba1c537a821092b Mon Sep 17 00:00:00 2001 From: Roman Perepelitsa Date: Tue, 11 Jan 2022 10:17:21 +0100 Subject: [PATCH 1/5] prompt: update powerlevel10k submodule to v1.16.0 Release notes: - https://github.com/romkatv/powerlevel10k/releases/tag/v1.16.0 --- modules/prompt/external/powerlevel10k | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/prompt/external/powerlevel10k b/modules/prompt/external/powerlevel10k index f5d6184..683a485 160000 --- a/modules/prompt/external/powerlevel10k +++ b/modules/prompt/external/powerlevel10k @@ -1 +1 @@ -Subproject commit f5d61840ae3a4f8c2765e1a67d94d9a96de71601 +Subproject commit 683a485232d75978a79199a305c4fc4843772a77 From d6e1ef5fcf22664dbf47a5be2709e05f1f6f21a1 Mon Sep 17 00:00:00 2001 From: Roman Perepelitsa Date: Wed, 2 Feb 2022 13:54:45 +0100 Subject: [PATCH 2/5] prompt: update powerlevel10k submodule to v1.16.1 Release notes: - https://github.com/romkatv/powerlevel10k/releases/tag/v1.16.1 --- modules/prompt/external/powerlevel10k | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/prompt/external/powerlevel10k b/modules/prompt/external/powerlevel10k index 683a485..8a676a9 160000 --- a/modules/prompt/external/powerlevel10k +++ b/modules/prompt/external/powerlevel10k @@ -1 +1 @@ -Subproject commit 683a485232d75978a79199a305c4fc4843772a77 +Subproject commit 8a676a9157d2b0e00e88d06456ac7317f11c0317 From d840f0fc7bb9e604fedef40eff4ed53f4c3c60f6 Mon Sep 17 00:00:00 2001 From: zbirenbaum Date: Thu, 3 Feb 2022 22:08:36 -0500 Subject: [PATCH 3/5] Fix crash on open caused by incorrect conditional in python module --- modules/python/init.zsh | 45 +++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/modules/python/init.zsh b/modules/python/init.zsh index 91aa6d0..22b61c3 100644 --- a/modules/python/init.zsh +++ b/modules/python/init.zsh @@ -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. From bf3dfe8c02d074fbf6e29238ce4277287e0d876f Mon Sep 17 00:00:00 2001 From: mattmc3 Date: Mon, 14 Feb 2022 20:55:40 -0500 Subject: [PATCH 4/5] Update Pure prompt to 1.20.0 --- modules/prompt/external/pure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/prompt/external/pure b/modules/prompt/external/pure index 2e354b8..c25ab93 160000 --- a/modules/prompt/external/pure +++ b/modules/prompt/external/pure @@ -1 +1 @@ -Subproject commit 2e354b80deae105ea246699c49e65dcd4fe8b759 +Subproject commit c25ab93eca8275144ad1ee9c2167668e550a82f5 From 7ec1ecde3a2b5f195432259bb32934cfd16dd5bc Mon Sep 17 00:00:00 2001 From: Indrajit Raychaudhuri Date: Sat, 26 Feb 2022 13:26:30 -0600 Subject: [PATCH 5/5] prompt: Update pure submodule to 1.20.1 --- modules/prompt/external/pure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/prompt/external/pure b/modules/prompt/external/pure index c25ab93..5b458ba 160000 --- a/modules/prompt/external/pure +++ b/modules/prompt/external/pure @@ -1 +1 @@ -Subproject commit c25ab93eca8275144ad1ee9c2167668e550a82f5 +Subproject commit 5b458ba5b75f49a8071d53c343f1a23631f7bced