From e86200e7aad9d4ccbabd34222ffcded3f52c6f65 Mon Sep 17 00:00:00 2001 From: Maxim Baz Date: Thu, 19 Dec 2019 00:37:51 +0100 Subject: [PATCH 1/7] Allow mapping Ctrl+S and Ctrl+Q shortcuts (#1750) --- modules/environment/init.zsh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/environment/init.zsh b/modules/environment/init.zsh index 7ae8c4f..b01a7ad 100644 --- a/modules/environment/init.zsh +++ b/modules/environment/init.zsh @@ -38,6 +38,9 @@ setopt INTERACTIVE_COMMENTS # Enable comments in interactive shell. setopt RC_QUOTES # Allow 'Henry''s Garage' instead of 'Henry'\''s Garage'. unsetopt MAIL_WARNING # Don't print a warning message if a mail file has been accessed. +# Allow mapping Ctrl+S and Ctrl+Q shortcuts +(( $+commands[stty] )) && stty -ixon + # # Jobs # From 7c94154dda2dfcf02515f1caf1e9dfe6d80b0350 Mon Sep 17 00:00:00 2001 From: Roman Perepelitsa Date: Sat, 28 Dec 2019 00:22:15 +0100 Subject: [PATCH 2/7] environment: apply `stty -ixon` only to tty (#1771) --- modules/environment/init.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/environment/init.zsh b/modules/environment/init.zsh index b01a7ad..ac76278 100644 --- a/modules/environment/init.zsh +++ b/modules/environment/init.zsh @@ -39,7 +39,7 @@ setopt RC_QUOTES # Allow 'Henry''s Garage' instead of 'Henry'\''s Gar unsetopt MAIL_WARNING # Don't print a warning message if a mail file has been accessed. # Allow mapping Ctrl+S and Ctrl+Q shortcuts -(( $+commands[stty] )) && stty -ixon +[[ -n ${TTY:-} && $+commands[stty] == 1 ]] && stty -ixon <$TTY >$TTY # # Jobs From c6efe8015224fe6dbc10d8f4b1aa52ce5afc9432 Mon Sep 17 00:00:00 2001 From: Roman Perepelitsa Date: Sat, 11 Jan 2020 09:48:45 +0100 Subject: [PATCH 3/7] runcoms: don't raise an error in zlogin when stderr is not a TTY (#1775) The existing code in runcoms/zlogin results in `$?` being equal to `1` when starting a login shell if stderr is not a TTY. For example: zsh -l 2>/dev/null When using a theme that displays error/success status of the last command, the first prompt will show an error. This commit fixes it so that error code is zero after sourcing zlogin (unless something unexpected and bad happens). --- runcoms/zlogin | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runcoms/zlogin b/runcoms/zlogin index 16fae45..9ea9792 100644 --- a/runcoms/zlogin +++ b/runcoms/zlogin @@ -15,7 +15,7 @@ } &! # Execute code only if STDERR is bound to a TTY. -[[ -o INTERACTIVE && -t 2 ]] && { +if [[ -o INTERACTIVE && -t 2 ]]; then # Print a random, hopefully interesting, adage. if (( $+commands[fortune] )); then @@ -23,4 +23,4 @@ print fi -} >&2 +fi >&2 From a3a51bdf6c485ff60153e80b66915626fcbacd4f Mon Sep 17 00:00:00 2001 From: mattmc3 Date: Mon, 13 Jan 2020 18:49:37 -0500 Subject: [PATCH 4/7] Support pmodule-allow-overrides feature (#1780) --- init.zsh | 8 +++++--- runcoms/zpreztorc | 3 +++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/init.zsh b/init.zsh index 87f095e..254ae52 100644 --- a/init.zsh +++ b/init.zsh @@ -98,15 +98,17 @@ function pmodload { else locations=(${pmodule_dirs:+${^pmodule_dirs}/$pmodule(-/FN)}) if (( ${#locations} > 1 )); then - print "$0: conflicting module locations: $locations" - continue + if ! zstyle -t ':prezto:load' pmodule-allow-overrides 'yes'; then + print "$0: conflicting module locations: $locations" + continue + fi elif (( ${#locations} < 1 )); then print "$0: no such module: $pmodule" continue fi # Grab the full path to this module - pmodule_location=${locations[1]} + pmodule_location=${locations[-1]} # Add functions to $fpath. fpath=(${pmodule_location}/functions(/FN) $fpath) diff --git a/runcoms/zpreztorc b/runcoms/zpreztorc index a549073..9a3c19a 100644 --- a/runcoms/zpreztorc +++ b/runcoms/zpreztorc @@ -18,6 +18,9 @@ zstyle ':prezto:*:*' color 'yes' # Add additional directories to load prezto modules from # zstyle ':prezto:load' pmodule-dirs $HOME/.zprezto-contrib +# Allow module overrides when pmodule-dirs causes module name collisions +# zstyle ':prezto:load' pmodule-allow-overrides 'yes' + # Set the Zsh modules to load (man zshmodules). # zstyle ':prezto:load' zmodule 'attr' 'stat' From 2acaec814fe85e45a59ba9a7c7ce9b9b39a73d3c Mon Sep 17 00:00:00 2001 From: Ivan Smirnov Date: Tue, 14 Jan 2020 09:08:47 -0800 Subject: [PATCH 5/7] autosuggestions: update to v0.6.4 --- modules/autosuggestions/external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/autosuggestions/external b/modules/autosuggestions/external index 733abd4..ae315de 160000 --- a/modules/autosuggestions/external +++ b/modules/autosuggestions/external @@ -1 +1 @@ -Subproject commit 733abd4af0f23f217caa2a303fbef66382d19d6f +Subproject commit ae315ded4dba10685dbbafbfa2ff3c1aefeb490d From 9ae279e25ad4afed2c069cf537b9984474afe5a4 Mon Sep 17 00:00:00 2001 From: Joost Cassee Date: Wed, 8 Jan 2020 16:26:10 +0100 Subject: [PATCH 6/7] Allow module functions directory to be a symlink The link must still point to a full directory. --- init.zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.zsh b/init.zsh index 254ae52..ebae912 100644 --- a/init.zsh +++ b/init.zsh @@ -111,7 +111,7 @@ function pmodload { pmodule_location=${locations[-1]} # Add functions to $fpath. - fpath=(${pmodule_location}/functions(/FN) $fpath) + fpath=(${pmodule_location}/functions(-/FN) $fpath) function { local pfunction From 1f52b03a4569eaf82a78ed9d0b76a9e21aa6dfee Mon Sep 17 00:00:00 2001 From: romkatv Date: Thu, 16 Jan 2020 16:45:12 +0100 Subject: [PATCH 7/7] prompt: update powerlevel10k submodule to the latest commit (#1784) - New features: - Show On Command -- Display prompt segments conditional on the command being typed. Demo: https://raw.githubusercontent.com/romkatv/powerlevel10k-media/master/show-on-command.gif - `p10k display` -- Quickly hide or show different parts of prompt. - `p10k-on-*` hooks -- Get notified about prompt-related events. - New prompt segments: - google_app_cred -- Google Application Credentials. - luaenv -- Lua version from https://github.com/cehoffman/luaen. - jenv -- Java version from https://github.com/jenv/jenv. - plenv -- Perl version from https://github.com/tokuhirom/plenv. - nnn -- Shell indicator for https://github.com/jarun/nnn. - Important fixes: - Ctrl-C no longer shortens prompt when used to terminate a zle widget with transient prompt enabled. - Don't print warnings in instant prompt when OMZ is updating. - rust_version now properly recognized rustup overrides. - Smoother rendering when using transient prompt. - New style in `p10k configure`: Lean restricted to 8 colors. --- 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 345d064..c21961b 160000 --- a/modules/prompt/external/powerlevel10k +++ b/modules/prompt/external/powerlevel10k @@ -1 +1 @@ -Subproject commit 345d0644a9c1a242ff131bde915bbe234c3dd745 +Subproject commit c21961b53c137253020aeffca2b132fdd6bcb116