1
0
mirror of https://github.com/dcarrillo/prezto.git synced 2024-12-22 23:08:00 +00:00

Merge upstream/master

This commit is contained in:
Daniel Carrillo 2019-09-20 21:16:11 +02:00
commit a1df63bade
27 changed files with 115 additions and 40 deletions

View File

@ -12,7 +12,6 @@ Options
- `PUSHD_SILENT` does not print the directory stack after `pushd` or `popd`. - `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. - `PUSHD_TO_HOME` pushes to the home directory when no argument is given.
- `CDABLE_VARS` changes directory to a path stored in a variable. - `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. - `MULTIOS` writes to multiple descriptors.
- `EXTENDED_GLOB` uses extended globbing syntax. - `EXTENDED_GLOB` uses extended globbing syntax.
- `CLOBBER` does not overwrite existing files with `>` and `>>`. Use `>!` and - `CLOBBER` does not overwrite existing files with `>` and `>>`. Use `>!` and

View File

@ -91,28 +91,32 @@ function bindkey-all {
# Exposes information about the Zsh Line Editor via the $editor_info associative # Exposes information about the Zsh Line Editor via the $editor_info associative
# array. # array.
function editor-info { function editor-info {
# Clean up previous $editor_info. # Ensure that we're going to set the editor-info for prompts that
unset editor_info # are prezto managed and/or compatible.
typeset -gA editor_info if zstyle -t ':prezto:module:prompt' managed; then
# Clean up previous $editor_info.
unset editor_info
typeset -gA editor_info
if [[ "$KEYMAP" == 'vicmd' ]]; then if [[ "$KEYMAP" == 'vicmd' ]]; then
zstyle -s ':prezto:module:editor:info:keymap:alternate' format 'REPLY' zstyle -s ':prezto:module:editor:info:keymap:alternate' format 'REPLY'
editor_info[keymap]="$REPLY" editor_info[keymap]="$REPLY"
else
zstyle -s ':prezto:module:editor:info:keymap:primary' format 'REPLY'
editor_info[keymap]="$REPLY"
if [[ "$ZLE_STATE" == *overwrite* ]]; then
zstyle -s ':prezto:module:editor:info:keymap:primary:overwrite' format 'REPLY'
editor_info[overwrite]="$REPLY"
else else
zstyle -s ':prezto:module:editor:info:keymap:primary:insert' format 'REPLY' zstyle -s ':prezto:module:editor:info:keymap:primary' format 'REPLY'
editor_info[overwrite]="$REPLY" editor_info[keymap]="$REPLY"
fi
fi
unset REPLY if [[ "$ZLE_STATE" == *overwrite* ]]; then
zle zle-reset-prompt zstyle -s ':prezto:module:editor:info:keymap:primary:overwrite' format 'REPLY'
editor_info[overwrite]="$REPLY"
else
zstyle -s ':prezto:module:editor:info:keymap:primary:insert' format 'REPLY'
editor_info[overwrite]="$REPLY"
fi
fi
unset REPLY
zle zle-reset-prompt
fi
} }
zle -N editor-info zle -N editor-info

View File

@ -26,7 +26,7 @@ setopt HIST_BEEP # Beep when accessing non-existent history.
# Variables # 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. 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. SAVEHIST=10000 # The maximum number of events to save in the history file.

View File

@ -10,6 +10,9 @@ nvm
[nvm][5] allows for managing multiple, isolated Node.js installations in the [nvm][5] allows for managing multiple, isolated Node.js installations in the
home directory. home directory.
This will be loaded automatically if nvm is installed in `$NVM_DIR`,
`~/.nvm`, or nvm is installed with homebrew.
nodenv nodenv
------ ------
@ -17,6 +20,9 @@ nodenv
Node versions. It's simple and predictable, Just Works, and is rock solid in Node versions. It's simple and predictable, Just Works, and is rock solid in
production. nodenv is forked from the popular [rbenv][7]. 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 Functions
--------- ---------

View File

@ -7,8 +7,8 @@
# #
# Load manually installed NVM into the shell session. # Load manually installed NVM into the shell session.
if [[ -s "$HOME/.nvm/nvm.sh" ]]; then if [[ -s "${NVM_DIR:=$HOME/.nvm}/nvm.sh" ]]; then
source "$HOME/.nvm/nvm.sh" source "${NVM_DIR}/nvm.sh"
# Load package manager installed NVM into the shell session. # Load package manager installed NVM into the shell session.
elif (( $+commands[brew] )) && \ elif (( $+commands[brew] )) && \
@ -17,8 +17,8 @@ elif (( $+commands[brew] )) && \
unset nvm_prefix unset nvm_prefix
# Load manually installed nodenv into the shell session. # Load manually installed nodenv into the shell session.
elif [[ -s "$HOME/.nodenv/bin/nodenv" ]]; then elif [[ -s "${NODENV_ROOT:=$HOME/.nodenv}/bin/nodenv" ]]; then
path=("$HOME/.nodenv/bin" $path) path=("${NODENV_ROOT}/bin" $path)
eval "$(nodenv init - --no-rehash zsh)" eval "$(nodenv init - --no-rehash zsh)"
# Load package manager installed nodenv into the shell session. # Load package manager installed nodenv into the shell session.

View File

@ -43,6 +43,22 @@ A prompt theme is an autoloadable function file with a special name,
project, themes **should** be placed in the *modules/prompt/functions* project, themes **should** be placed in the *modules/prompt/functions*
directory. directory.
### Required Variables
To ensure that your function works with the editor-info module you'll need to
set the following variable:
```
# Tell prezto we can manage this prompt
zstyle ':prezto:module:prompt' managed 'yes'
```
This is to ensure compatibility with outside prompts, while allowing prezto
and prezto-compatible prompts to take full advantage of the editor module.
This should be set in the `prompt_name_setup` function after you've added
any additional hooks with `add-zsh-hook precmd prompt_name_precmd`. See below
for additional information about functions and hooks.
### Theme Functions ### Theme Functions
There are three theme functions, a setup function, a help function, and There are three theme functions, a setup function, a help function, and

@ -1 +1 @@
Subproject commit 58f7ba70f05e75802299848e7e31c7d7a7fd0c97 Subproject commit 95c2b1577f455728ec01cec001a86c216d0af2bd

@ -1 +1 @@
Subproject commit 613ffec4b61fc8c97427a99bcca72808a980645e Subproject commit 5886154bb14965f59d26f349b97e2c5e9104bf93

View File

@ -28,3 +28,4 @@ unset current_pwd
print "$ret_directory" print "$ret_directory"
# } # }
# vim: ft=zsh

View File

@ -104,6 +104,9 @@ function prompt_cloud_setup {
# Add hook for calling git-info before each command. # Add hook for calling git-info before each command.
add-zsh-hook precmd prompt_cloud_precmd add-zsh-hook precmd prompt_cloud_precmd
# Tell prezto we can manage this prompt
zstyle ':prezto:module:prompt' managed 'yes'
# Set git-info parameters. # Set git-info parameters.
zstyle ':prezto:module:git:info' verbose 'yes' zstyle ':prezto:module:git:info' verbose 'yes'
zstyle ':prezto:module:git:info:dirty' format "%%B%F{$secondary_color}]%f%%b %F{yellow}⚡%f" zstyle ':prezto:module:git:info:dirty' format "%%B%F{$secondary_color}]%f%%b %F{yellow}⚡%f"
@ -119,3 +122,4 @@ function prompt_cloud_setup {
} }
prompt_cloud_setup "$@" prompt_cloud_setup "$@"
# vim: ft=zsh

View File

@ -45,6 +45,9 @@ function prompt_damoekri_setup {
# Add hook for calling git-info and ruby-info before each command. # Add hook for calling git-info and ruby-info before each command.
add-zsh-hook precmd prompt_damoekri_precmd add-zsh-hook precmd prompt_damoekri_precmd
# Tell prezto we can manage this prompt
zstyle ':prezto:module:prompt' managed 'yes'
# Set editor-info parameters. # Set editor-info parameters.
zstyle ':prezto:module:editor:info:keymap:primary' format ' %F{green}»%f' zstyle ':prezto:module:editor:info:keymap:primary' format ' %F{green}»%f'
@ -71,3 +74,4 @@ function prompt_damoekri_setup {
} }
prompt_damoekri_setup "$@" prompt_damoekri_setup "$@"
# vim: ft=zsh

View File

@ -47,6 +47,9 @@ function prompt_giddie_setup {
# Add hook to set up prompt parameters before each command. # Add hook to set up prompt parameters before each command.
add-zsh-hook precmd prompt_giddie_precmd add-zsh-hook precmd prompt_giddie_precmd
# Tell prezto we can manage this prompt
zstyle ':prezto:module:prompt' managed 'yes'
# Set editor-info parameters. # Set editor-info parameters.
zstyle ':prezto:module:editor:info:completing' format '%F{green}...%f' zstyle ':prezto:module:editor:info:completing' format '%F{green}...%f'
zstyle ':prezto:module:editor:info:keymap:alternate' format '%F{yellow}--- COMMAND ---%f' zstyle ':prezto:module:editor:info:keymap:alternate' format '%F{yellow}--- COMMAND ---%f'
@ -74,3 +77,4 @@ function prompt_giddie_setup {
} }
prompt_giddie_setup "$@" prompt_giddie_setup "$@"
# vim: ft=zsh

View File

@ -40,6 +40,9 @@ function prompt_kylewest_setup {
# Add hook for calling git-info before each command. # Add hook for calling git-info before each command.
add-zsh-hook precmd prompt_kylewest_precmd add-zsh-hook precmd prompt_kylewest_precmd
# Tell prezto we can manage this prompt
zstyle ':prezto:module:prompt' managed 'yes'
# Set editor-info parameters. # Set editor-info parameters.
zstyle ':prezto:module:editor:info:completing' format '%B%F{red}...%f%b' zstyle ':prezto:module:editor:info:completing' format '%B%F{red}...%f%b'
zstyle ':prezto:module:editor:info:keymap:primary' format "%B%F{green}%f%b" zstyle ':prezto:module:editor:info:keymap:primary' format "%B%F{green}%f%b"
@ -63,3 +66,4 @@ function prompt_kylewest_setup {
} }
prompt_kylewest_setup "$@" prompt_kylewest_setup "$@"
# vim: ft=zsh

View File

@ -32,6 +32,9 @@ function prompt_minimal_setup {
# Add hook for calling vcs_info before each command. # Add hook for calling vcs_info before each command.
add-zsh-hook precmd prompt_minimal_precmd add-zsh-hook precmd prompt_minimal_precmd
# Tell prezto we can manage this prompt
zstyle ':prezto:module:prompt' managed 'yes'
# Set vcs_info parameters. # Set vcs_info parameters.
zstyle ':vcs_info:*' enable bzr git hg svn zstyle ':vcs_info:*' enable bzr git hg svn
zstyle ':vcs_info:*' check-for-changes true zstyle ':vcs_info:*' check-for-changes true
@ -57,3 +60,4 @@ function prompt_minimal_preview {
} }
prompt_minimal_setup "$@" prompt_minimal_setup "$@"
# vim: ft=zsh

View File

@ -35,6 +35,9 @@ function prompt_nicoulaj_setup {
# Add hook for calling vcs_info before each command. # Add hook for calling vcs_info before each command.
add-zsh-hook precmd prompt_nicoulaj_precmd add-zsh-hook precmd prompt_nicoulaj_precmd
# Tell prezto we can manage this prompt
zstyle ':prezto:module:prompt' managed 'yes'
# Customizable parameters. # Customizable parameters.
local max_path_chars=30 local max_path_chars=30
local user_char='' local user_char=''
@ -58,3 +61,4 @@ function prompt_nicoulaj_setup {
} }
prompt_nicoulaj_setup "$@" prompt_nicoulaj_setup "$@"
# vim: ft=zsh

View File

@ -116,6 +116,9 @@ function prompt_paradox_setup {
add-zsh-hook preexec prompt_paradox_preexec add-zsh-hook preexec prompt_paradox_preexec
add-zsh-hook precmd prompt_paradox_precmd add-zsh-hook precmd prompt_paradox_precmd
# Tell prezto we can manage this prompt
zstyle ':prezto:module:prompt' managed 'yes'
# Set editor-info parameters. # Set editor-info parameters.
zstyle ':prezto:module:editor:info:completing' format '%B%F{red}...%f%b' zstyle ':prezto:module:editor:info:completing' format '%B%F{red}...%f%b'
zstyle ':prezto:module:editor:info:keymap:primary' format '%B%F{blue}%f%b' zstyle ':prezto:module:editor:info:keymap:primary' format '%B%F{blue}%f%b'
@ -154,3 +157,4 @@ ${(e)$(prompt_paradox_build_prompt)}
} }
prompt_paradox_setup "$@" prompt_paradox_setup "$@"
# vim: ft=zsh

View File

@ -34,6 +34,9 @@ function prompt_peepcode_setup {
# Add a hook for calling info functions before each command. # Add a hook for calling info functions before each command.
add-zsh-hook precmd prompt_peepcode_precmd add-zsh-hook precmd prompt_peepcode_precmd
# Tell prezto we can manage this prompt
zstyle ':prezto:module:prompt' managed 'yes'
# Set git-info parameters. # Set git-info parameters.
zstyle ':prezto:module:git:info' verbose 'no' zstyle ':prezto:module:git:info' verbose 'no'
zstyle ':prezto:module:git:info:action' format ' +%s' zstyle ':prezto:module:git:info:action' format ' +%s'
@ -83,3 +86,4 @@ function prompt_peepcode_preview {
} }
prompt_peepcode_setup "$@" prompt_peepcode_setup "$@"
# vim: ft=zsh

View File

@ -36,6 +36,9 @@ function prompt_skwp_setup {
# Add hook to set up prompt parameters before each command. # Add hook to set up prompt parameters before each command.
add-zsh-hook precmd prompt_skwp_precmd add-zsh-hook precmd prompt_skwp_precmd
# Tell prezto we can manage this prompt
zstyle ':prezto:module:prompt' managed 'yes'
# Use extended color pallete if available. # Use extended color pallete if available.
if [[ $TERM = *256color* || $TERM = *rxvt* ]]; then if [[ $TERM = *256color* || $TERM = *rxvt* ]]; then
_prompt_skwp_colors=( _prompt_skwp_colors=(
@ -73,3 +76,4 @@ function prompt_skwp_setup {
} }
prompt_skwp_setup "$@" prompt_skwp_setup "$@"
# vim: ft=zsh

View File

@ -41,6 +41,9 @@ function prompt_smiley_setup {
# Add hook for calling git-info before each command. # Add hook for calling git-info before each command.
add-zsh-hook precmd prompt_smiley_precmd add-zsh-hook precmd prompt_smiley_precmd
# Tell prezto we can manage this prompt
zstyle ':prezto:module:prompt' managed 'yes'
# Set editor-info parameters. # Set editor-info parameters.
zstyle ':prezto:module:editor:info:completing' format '%B%F{red}...%f%b' zstyle ':prezto:module:editor:info:completing' format '%B%F{red}...%f%b'
@ -63,3 +66,4 @@ function prompt_smiley_setup {
} }
prompt_smiley_setup "$@" prompt_smiley_setup "$@"
# vim: ft=zsh

View File

@ -118,6 +118,9 @@ function prompt_sorin_setup {
# Add hook for calling git-info before each command. # Add hook for calling git-info before each command.
add-zsh-hook precmd prompt_sorin_precmd add-zsh-hook precmd prompt_sorin_precmd
# Tell prezto we can manage this prompt
zstyle ':prezto:module:prompt' managed 'yes'
# Set editor-info parameters. # Set editor-info parameters.
zstyle ':prezto:module:editor:info:completing' format '%B%F{7}...%f%b' zstyle ':prezto:module:editor:info:completing' format '%B%F{7}...%f%b'
zstyle ':prezto:module:editor:info:keymap:primary' format ' %B%F{1}%F{3}%F{2}%f%b' zstyle ':prezto:module:editor:info:keymap:primary' format ' %B%F{1}%F{3}%F{2}%f%b'
@ -176,3 +179,4 @@ function prompt_sorin_preview {
} }
prompt_sorin_setup "$@" prompt_sorin_setup "$@"
# vim: ft=zsh

View File

@ -41,6 +41,9 @@ function prompt_steeef_setup {
# Add hook for calling vcs_info before each command. # Add hook for calling vcs_info before each command.
add-zsh-hook precmd prompt_steeef_precmd add-zsh-hook precmd prompt_steeef_precmd
# Tell prezto we can manage this prompt
zstyle ':prezto:module:prompt' managed 'yes'
# Use extended color pallete if available. # Use extended color pallete if available.
if [[ $TERM = *256color* || $TERM = *rxvt* ]]; then if [[ $TERM = *256color* || $TERM = *rxvt* ]]; then
_prompt_steeef_colors=( _prompt_steeef_colors=(
@ -104,3 +107,4 @@ function prompt_steeef_preview {
} }
prompt_steeef_setup "$@" prompt_steeef_setup "$@"
# vim: ft=zsh

View File

@ -35,6 +35,9 @@ execution of `pyenv`.
Install Python versions with `pyenv install` into `~/.pyenv/versions`. 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 Local Package Installation
-------------------------- --------------------------

View File

@ -8,17 +8,12 @@
# #
# Load manually installed pyenv into the path # Load manually installed pyenv into the path
if [[ -n "$PYENV_ROOT" && -s "$PYENV_ROOT/bin/pyenv" ]]; then if [[ -s "${PYENV_ROOT:=$HOME/.pyenv}/bin/pyenv" ]]; then
path=("$PYENV_ROOT/bin" $path) path=("${PYENV_ROOT}/bin" $path)
elif [[ -s "$HOME/.pyenv/bin/pyenv" ]]; then eval "$(pyenv init - --no-rehash zsh)"
path=("$HOME/.pyenv/bin" $path)
fi
# Load pyenv into the current python session # Load pyenv into the current python session
if (( $+commands[pyenv] )); then elif (( $+commands[pyenv] )); then
if [[ -z "$PYENV_ROOT" ]]; then
export PYENV_ROOT=$(pyenv root)
fi
eval "$(pyenv init - --no-rehash zsh)" eval "$(pyenv init - --no-rehash zsh)"
# Prepend PEP 370 per user site packages directory, which defaults to # Prepend PEP 370 per user site packages directory, which defaults to

View File

@ -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 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. 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 chruby
------ ------

View File

@ -15,8 +15,8 @@ if [[ -s "$HOME/.rvm/scripts/rvm" ]]; then
source "$HOME/.rvm/scripts/rvm" source "$HOME/.rvm/scripts/rvm"
# Load manually installed rbenv into the shell session. # Load manually installed rbenv into the shell session.
elif [[ -s "$HOME/.rbenv/bin/rbenv" ]]; then elif [[ -s "${RBENV_ROOT:=$HOME/.rbenv}/bin/rbenv" ]]; then
path=("$HOME/.rbenv/bin" $path) path=("${RBENV_ROOT}/bin" $path)
eval "$(rbenv init - --no-rehash zsh)" eval "$(rbenv init - --no-rehash zsh)"
# Load package manager installed rbenv into the shell session. # Load package manager installed rbenv into the shell session.

@ -1 +1 @@
Subproject commit 1e34c4aa0bcbdde5173aab15600784edf0a212fd Subproject commit 35c8690c0025ceef9584f64da86ced3a72ee32b6

View File

@ -23,7 +23,7 @@ if ([[ "$TERM_PROGRAM" = 'iTerm.app' ]] && \
_tmux_iterm_integration='-CC' _tmux_iterm_integration='-CC'
fi 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 ) || ( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' remote ) ||
( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' local ) \ ( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' local ) \
); then ); then