Merge commit 'd955fbdeb729ed038ffa7af16c1cf82dd68aff1e'

Andreas Pataki · Andreas Pataki · commit 91c9d4ea16ea · 2020-03-09T09:42:21.000+01:00
* commit 'd955fbdeb729ed038ffa7af16c1cf82dd68aff1e': (31 commits) prompt: update powerlevel10k submodule to v1.3.0 use $TTY instead of $(tty); it's faster and more reliable prompt: update powerlevel10k submodule to v1.2.0 Updated prompt pure to version 1.11.0 prompt: update powerlevel10k submodule to v1.1 Update documentation environment: improve the TTY check (sorin-ionescu#1785) node: suppress node-info when nvm points system-wide node (sorin-ionescu#802) prompt: update powerlevel10k submodule to the latest commit (sorin-ionescu#1784) Allow module functions directory to be a symlink autosuggestions: update to v0.6.4 Support pmodule-allow-overrides feature (sorin-ionescu#1780) runcoms: don't raise an error in zlogin when stderr is not a TTY (sorin-ionescu#1775) environment: apply `stty -ixon` only to tty (sorin-ionescu#1771) Allow mapping Ctrl+S and Ctrl+Q shortcuts (sorin-ionescu#1750) prompt: update powerlevel10k submodule to the latest commit (sorin-ionescu#1768) prompt: update powerlevel10k submodule to the latest commit (sorin-ionescu#1761) prompt: update powerlevel10k submodule to the latest commit (sorin-ionescu#1757) homebrew: add alias `brewL` Remove documentation for obsolete `brewC` alias
diff --git a/init.zsh b/init.zsh
@@ -44,7 +44,7 @@ function zprezto-update {
         printf "There is an update available. Trying to pull.\n\n"
         if git pull --ff-only; then
           printf "Syncing submodules\n"
-          git submodule update --recursive
+          git submodule update --init --recursive
           return $?
         else
           cannot-fast-forward
@@ -98,18 +98,20 @@ 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)
+      fpath=(${pmodule_location}/functions(-/FN) $fpath)
 
       function {
         local pfunction
diff --git a/modules/directory/README.md b/modules/directory/README.md
@@ -12,7 +12,6 @@ Options
   - `PUSHD_SILENT` does not print the directory stack after `pushd` or `popd`.
   - `PUSHD_TO_HOME` pushes to the home directory when no argument is given.
   - `CDABLE_VARS` changes directory to a path stored in a variable.
-  - `AUTO_NAME_DIRS` auto adds variable-stored paths to `~` list.
   - `MULTIOS` writes to multiple descriptors.
   - `EXTENDED_GLOB` uses extended globbing syntax.
   - `CLOBBER` does not overwrite existing files with `>` and `>>`. Use `>!` and
diff --git a/modules/editor/README.md b/modules/editor/README.md
@@ -106,4 +106,4 @@ Authors
 
   - [Sorin Ionescu](https://github.com/sorin-ionescu)
 
-[1]: https://github.com/sorin-ionescu/oh-my-zsh/issues
+[1]: https://github.com/sorin-ionescu/prezto/issues
diff --git 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
+[[ -r ${TTY:-} && -w ${TTY:-} && $+commands[stty] == 1 ]] && stty -ixon <$TTY >$TTY
+
 #
 # Jobs
 #
diff --git a/modules/gpg/init.zsh b/modules/gpg/init.zsh
@@ -26,7 +26,7 @@ if [[ -z "$GPG_AGENT_INFO" && ! -S "${GNUPGHOME:-$HOME/.gnupg}/S.gpg-agent" ]];
 fi
 
 # Inform gpg-agent of the current TTY for user prompts.
-export GPG_TTY="$(tty)"
+export GPG_TTY=$TTY
 
 # Integrate with the SSH module.
 if grep '^enable-ssh-support' "$_gpg_agent_conf" &> /dev/null; then
diff --git a/modules/history/README.md b/modules/history/README.md
@@ -3,6 +3,10 @@ History
 
 Sets [history][1] options and defines history aliases.
 
+**Note:** If you are migrating from oh-my-zsh and want to keep your history, you
+will either need to set HISTFILE manually to `$HOME/.zsh_history` or rename
+`~/.zsh_history` to ~/.zhistory`.
+
 Options
 -------
 
diff --git a/modules/history/init.zsh b/modules/history/init.zsh
@@ -26,7 +26,7 @@ setopt HIST_BEEP                 # Beep when accessing non-existent history.
 # Variables
 #
 
-HISTFILE="${ZDOTDIR:-$HOME}/.zhistory"  # The path to the history file.
+HISTFILE="${HISTFILE:-${ZDOTDIR:-$HOME}/.zhistory}"  # The path to the history file.
 HISTSIZE=10000                   # The maximum number of events to save in the internal history.
 SAVEHIST=10000                   # The maximum number of events to save in the history file.
 
diff --git a/modules/homebrew/README.md b/modules/homebrew/README.md
@@ -18,8 +18,8 @@ Aliases
 ### Homebrew
 
   - `brewc` cleans outdated brews and their cached archives.
-  - `brewC` cleans outdated brews, including keg-only, and their cached archives.
   - `brewi` installs a formula.
+  - `brewL` lists installed formulae that are not dependencies of another installed formula.
   - `brewl` lists installed formulae.
   - `brewo` lists brews which have an update available.
   - `brews` searches for a formula.
diff --git a/modules/homebrew/init.zsh b/modules/homebrew/init.zsh
@@ -14,7 +14,7 @@ fi
 # Variables
 #
 
-# Load standard Homebrew shellenv into the shell session. 
+# Load standard Homebrew shellenv into the shell session.
 # Load 'HOMEBREW_' prefixed variables only. Avoid loading 'PATH' related
 # variables as they are already handled in standard zsh configuration.
 if (( $+commands[brew] )); then
@@ -27,8 +27,8 @@ fi
 
 # Homebrew
 alias brewc='brew cleanup'
-alias brewC='brew cleanup --force'
 alias brewi='brew install'
+alias brewL='brew leaves'
 alias brewl='brew list'
 alias brewo='brew outdated'
 alias brews='brew search'
diff --git a/modules/node/README.md b/modules/node/README.md
@@ -10,13 +10,19 @@ nvm
 [nvm][5] allows for managing multiple, isolated Node.js installations in the
 home directory.
 
+This will be loaded automatically if nvm is installed in `$NVM_DIR`,
+`~/.nvm`, or nvm is installed with homebrew.
+
 nodenv
 ------
 
 [nodenv][6] does one thing well. nodenv is concerned solely with switching
 Node versions. It's simple and predictable, Just Works, and is rock solid in
 production. nodenv is forked from the popular [rbenv][7].
 
+This will be loaded automatically if nodenv is installed in `$NODENV_ROOT`,
+`~/.nodenv`, or `nodenv` is on the path.
+
 Functions
 ---------
 
diff --git a/modules/node/init.zsh b/modules/node/init.zsh
@@ -7,8 +7,8 @@
 #
 
 # Load manually installed NVM into the shell session.
-if [[ -s "$HOME/.nvm/nvm.sh" ]]; then
-  source "$HOME/.nvm/nvm.sh"
+if [[ -s "${NVM_DIR:=$HOME/.nvm}/nvm.sh" ]]; then
+  source "${NVM_DIR}/nvm.sh"
 
 # Load package manager installed NVM into the shell session.
 elif (( $+commands[brew] )) && \
@@ -17,8 +17,8 @@ elif (( $+commands[brew] )) && \
   unset nvm_prefix
 
 # Load manually installed nodenv into the shell session.
-elif [[ -s "$HOME/.nodenv/bin/nodenv" ]]; then
-  path=("$HOME/.nodenv/bin" $path)
+elif [[ -s "${NODENV_ROOT:=$HOME/.nodenv}/bin/nodenv" ]]; then
+  path=("${NODENV_ROOT}/bin" $path)
   eval "$(nodenv init - --no-rehash zsh)"
 
 # Load package manager installed nodenv into the shell session.
diff --git a/modules/prompt/external/powerlevel10k b/modules/prompt/external/powerlevel10k
@@ -1 +1 @@
-Subproject commit 3090ae6633aedc50b43524e6c2ce1482b0a15772
+Subproject commit 7306efb94ba739f714972038ad74c48d2bebfdd6
diff --git a/modules/prompt/external/pure b/modules/prompt/external/pure
@@ -1 +1 @@
-Subproject commit 7aade5fca2acae3f10e260d0c076af6356da9dc6
+Subproject commit 2e354b80deae105ea246699c49e65dcd4fe8b759
diff --git a/modules/python/README.md b/modules/python/README.md
@@ -35,6 +35,9 @@ execution of `pyenv`.
 
 Install Python versions with `pyenv install` into `~/.pyenv/versions`.
 
+This will be loaded automatically if pyenv is installed to `$PYENV_ROOT`,
+`~/.pyenv`, or if the `pyenv` command is on the path.
+
 Local Package Installation
 --------------------------
 
diff --git a/modules/python/init.zsh b/modules/python/init.zsh
@@ -8,17 +8,12 @@
 #
 
 # Load manually installed pyenv into the path
-if [[ -n "$PYENV_ROOT" && -s "$PYENV_ROOT/bin/pyenv" ]]; then
-  path=("$PYENV_ROOT/bin" $path)
-elif [[ -s "$HOME/.pyenv/bin/pyenv" ]]; then
-  path=("$HOME/.pyenv/bin" $path)
-fi
+if [[ -s "${PYENV_ROOT:=$HOME/.pyenv}/bin/pyenv" ]]; then
+  path=("${PYENV_ROOT}/bin" $path)
+  eval "$(pyenv init - --no-rehash zsh)"
 
 # Load pyenv into the current python session
-if (( $+commands[pyenv] )); then
-  if [[ -z "$PYENV_ROOT" ]]; then
-    export PYENV_ROOT=$(pyenv root)
-  fi
+elif (( $+commands[pyenv] )); then
   eval "$(pyenv init - --no-rehash zsh)"
 
 # Prepend PEP 370 per user site packages directory, which defaults to
diff --git a/modules/ruby/README.md b/modules/ruby/README.md
@@ -32,6 +32,9 @@ multiple, isolated Ruby installations in the home directory.
 While it is not as feature rich as RVM, it is not loaded into the shell and is
 not known to cause conflicts with shell scripts.
 
+This will be loaded automatically if rbenv is installed to `$RBENV_ROOT`,
+`~/.rbenv`, or if the `rbenv` command is on the path.
+
 chruby
 ------
 
diff --git a/modules/ruby/init.zsh b/modules/ruby/init.zsh
@@ -15,8 +15,8 @@ if [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
   source "$HOME/.rvm/scripts/rvm"
 
 # Load manually installed rbenv into the shell session.
-elif [[ -s "$HOME/.rbenv/bin/rbenv" ]]; then
-  path=("$HOME/.rbenv/bin" $path)
+elif [[ -s "${RBENV_ROOT:=$HOME/.rbenv}/bin/rbenv" ]]; then
+  path=("${RBENV_ROOT}/bin" $path)
   eval "$(rbenv init - --no-rehash zsh)"
 
 # Load package manager installed rbenv into the shell session.
diff --git a/modules/tmux/init.zsh b/modules/tmux/init.zsh
@@ -23,7 +23,7 @@ if ([[ "$TERM_PROGRAM" = 'iTerm.app' ]] && \
   _tmux_iterm_integration='-CC'
 fi
 
-if [[ -z "$TMUX" && -z "$EMACS" && -z "$VIM" && -z "$INSIDE_EMACS" && -z "$VSCODE_PID" ]] && ( \
+if [[ -z "$TMUX" && -z "$EMACS" && -z "$VIM" && -z "$INSIDE_EMACS" && "$TERM_PROGRAM" != "vscode" ]] && ( \
   ( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' remote ) ||
   ( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' local ) \
 ); then
diff --git a/modules/utility/init.zsh b/modules/utility/init.zsh
@@ -66,10 +66,10 @@ alias mvi="${aliases[mv]:-mv} -i"
 alias cpi="${aliases[cp]:-cp} -i"
 alias lni="${aliases[ln]:-ln} -i"
 if zstyle -T ':prezto:module:utility' safe-ops; then
-  alias rm='rmi'
-  alias mv='mvi'
-  alias cp='cpi'
-  alias ln='lni'
+  alias rm="${aliases[rm]:-rm} -i"
+  alias mv="${aliases[mv]:-mv} -i"
+  alias cp="${aliases[cp]:-cp} -i"
+  alias ln="${aliases[ln]:-ln} -i"
 fi
 
 # ls
diff --git 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'
 

Original file line number	Diff line number	Diff line change
`@@ -106,4 +106,4 @@ Authors`
`106`	`106`
`107`	`107`	`- [Sorin Ionescu](https://github.com/sorin-ionescu)`
`108`	`108`
`109`		`-[1]: https://github.com/sorin-ionescu/oh-my-zsh/issues`
	`109`	`+[1]: https://github.com/sorin-ionescu/prezto/issues`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,9 @@ setopt INTERACTIVE_COMMENTS # Enable comments in interactive shell.`
`38`	`38`	`setopt RC_QUOTES # Allow 'Henry''s Garage' instead of 'Henry'\''s Garage'.`
`39`	`39`	`unsetopt MAIL_WARNING # Don't print a warning message if a mail file has been accessed.`
`40`	`40`
	`41`	`+# Allow mapping Ctrl+S and Ctrl+Q shortcuts`
	`42`	`+[[ -r ${TTY:-} && -w ${TTY:-} && $+commands[stty] == 1 ]] && stty -ixon <$TTY >$TTY`
	`43`	`+`
`41`	`44`	`#`
`42`	`45`	`# Jobs`
`43`	`46`	`#`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ setopt HIST_BEEP # Beep when accessing non-existent history.`
`26`	`26`	`# Variables`
`27`	`27`	`#`
`28`	`28`
`29`		`-HISTFILE="${ZDOTDIR:-$HOME}/.zhistory" # The path to the history file.`
	`29`	`+HISTFILE="${HISTFILE:-${ZDOTDIR:-$HOME}/.zhistory}" # The path to the history file.`
`30`	`30`	`HISTSIZE=10000 # The maximum number of events to save in the internal history.`
`31`	`31`	`SAVEHIST=10000 # The maximum number of events to save in the history file.`
`32`	`32`