mirror of
https://github.com/dcarrillo/prezto.git
synced 2025-07-01 20:59:26 +00:00
Compare commits
26 Commits
pull/556-p
...
pull/563-c
Author | SHA1 | Date | |
---|---|---|---|
c2d6b378a6 | |||
7823bb9985 | |||
8f711d64b5 | |||
c4b50ec1a0 | |||
62198b0326 | |||
b4884d4d45 | |||
abfc4ab6e5 | |||
657e8a16f4 | |||
ea25ccf62c | |||
3e88b8bcdc | |||
e892d7f3c7 | |||
4e4a6fcc63 | |||
3e8349ddde | |||
fdb406f917 | |||
493bf302f6 | |||
a217af99f3 | |||
06cc5088aa | |||
5088ca4839 | |||
0f696fc206 | |||
96bcf813b7 | |||
fe8f9a9b5b | |||
bf9dbfd5b9 | |||
ff0dfa424d | |||
fedad8e9cf | |||
478653fab2 | |||
10cf701864 |
@ -8,8 +8,8 @@ and prompt themes.
|
||||
Installation
|
||||
------------
|
||||
|
||||
Prezto will work with any recent release of Zsh, but the minimum recommended
|
||||
version is 4.3.11.
|
||||
Prezto will work with any recent release of Zsh, but the minimum required
|
||||
version is 4.3.17.
|
||||
|
||||
1. Launch Zsh:
|
||||
|
||||
|
2
init.zsh
2
init.zsh
@ -10,7 +10,7 @@
|
||||
#
|
||||
|
||||
# Check for the minimum supported version.
|
||||
min_zsh_version='4.3.11'
|
||||
min_zsh_version='4.3.17'
|
||||
if ! autoload -Uz is-at-least || ! is-at-least "$min_zsh_version"; then
|
||||
print "prezto: old shell detected, minimum required: $min_zsh_version" >&2
|
||||
return 1
|
||||
|
@ -102,10 +102,10 @@ Node.js
|
||||
|
||||
Provides utility functions for Node.js and loads npm completion.
|
||||
|
||||
Ocaml
|
||||
OCaml
|
||||
-----
|
||||
|
||||
Initializes Ocaml package management.
|
||||
Initializes OCaml package management.
|
||||
|
||||
OSX
|
||||
---
|
||||
|
@ -54,8 +54,8 @@ while (( $# > 0 )); do
|
||||
(*.Z) uncompress "$1" ;;
|
||||
(*.zip) unzip "$1" -d $extract_dir ;;
|
||||
(*.rar) unrar &> /dev/null \
|
||||
&& unrar e -ad "$1" \
|
||||
|| rar e -ad "$1" ;;
|
||||
&& unrar x -ad "$1" \
|
||||
|| rar x -ad "$1" ;;
|
||||
(*.7z) 7za x "$1" ;;
|
||||
(*.deb)
|
||||
mkdir -p "$extract_dir/control"
|
||||
|
Submodule modules/completion/external updated: 1d6a2aa024...08afea0e23
@ -116,7 +116,7 @@ zstyle ':completion:*:(rm|kill|diff):*' ignore-line other
|
||||
zstyle ':completion:*:rm:*' file-patterns '*:all-files'
|
||||
|
||||
# Kill
|
||||
zstyle ':completion:*:*:*:*:processes' command 'ps -u $USER -o pid,user,comm -w'
|
||||
zstyle ':completion:*:*:*:*:processes' command 'ps -u $USER -o pid,user,command -w'
|
||||
zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;36=0=01'
|
||||
zstyle ':completion:*:*:kill:*' menu yes select
|
||||
zstyle ':completion:*:*:kill:*' force-list always
|
||||
|
@ -49,8 +49,7 @@ To indicate when the editor is completing, add the following to your
|
||||
zstyle ':prezto:module:editor:info:completing' format '...'
|
||||
|
||||
Then add `$editor_info[context]`, where context is *keymap*, *insert*, or
|
||||
*overwrite*, to `$PROMPT` or `$RPROMPT` and call `editor-info` in the
|
||||
`prompt_name_preexec` hook function.
|
||||
*overwrite*, to `$PROMPT` or `$RPROMPT`.
|
||||
|
||||
Authors
|
||||
-------
|
||||
|
@ -57,11 +57,22 @@ key_info=(
|
||||
'BackTab' "$terminfo[kcbt]"
|
||||
)
|
||||
|
||||
# Escape sequences from Debian's inputrc.
|
||||
key_info+=(
|
||||
'ControlLeft' '\e[1;5D \e[5D \e\e[D \eOd'
|
||||
'ControlRight' '\e[1;5C \e[5C \e\e[C \eOc'
|
||||
)
|
||||
|
||||
# if [[ "$TERM" == rxvt* ]]; then
|
||||
# key_info[ControlLeft]+=' \eOd'
|
||||
# key_info[ControlRight]+=' \eOc'
|
||||
# fi
|
||||
|
||||
# Set empty $key_info values to an invalid UTF-8 sequence to induce silent
|
||||
# bindkey failure.
|
||||
for key in "${(k)key_info[@]}"; do
|
||||
if [[ -z "$key_info[$key]" ]]; then
|
||||
key_info["$key"]='<27>'
|
||||
key_info[$key]='<27>'
|
||||
fi
|
||||
done
|
||||
|
||||
@ -206,10 +217,10 @@ bindkey -d
|
||||
# Emacs Key Bindings
|
||||
#
|
||||
|
||||
for key ("$key_info[Escape]"{B,b}) bindkey -M emacs "$key" emacs-backward-word
|
||||
for key ("$key_info[Escape]"{F,f}) bindkey -M emacs "$key" emacs-forward-word
|
||||
bindkey -M emacs "$key_info[Escape]$key_info[Left]" emacs-backward-word
|
||||
bindkey -M emacs "$key_info[Escape]$key_info[Right]" emacs-forward-word
|
||||
for key in "$key_info[Escape]"{B,b} "${(s: :)key_info[ControlLeft]}"
|
||||
bindkey -M emacs "$key" emacs-backward-word
|
||||
for key in "$key_info[Escape]"{F,f} "${(s: :)key_info[ControlRight]}"
|
||||
bindkey -M emacs "$key" emacs-forward-word
|
||||
|
||||
# Kill to the beginning of the line.
|
||||
for key in "$key_info[Escape]"{K,k}
|
||||
|
@ -348,13 +348,13 @@ function git-info {
|
||||
# Format added.
|
||||
if (( added > 0 )); then
|
||||
zstyle -s ':prezto:module:git:info:added' format 'added_format'
|
||||
zformat -f added_formatted "$added_format" "a:$added_format"
|
||||
zformat -f added_formatted "$added_format" "a:$added"
|
||||
fi
|
||||
|
||||
# Format deleted.
|
||||
if (( deleted > 0 )); then
|
||||
zstyle -s ':prezto:module:git:info:deleted' format 'deleted_format'
|
||||
zformat -f deleted_formatted "$deleted_format" "d:$deleted_format"
|
||||
zformat -f deleted_formatted "$deleted_format" "d:$deleted"
|
||||
fi
|
||||
|
||||
# Format modified.
|
||||
|
@ -15,11 +15,14 @@ _gpg_agent_conf="$HOME/.gnupg/gpg-agent.conf"
|
||||
_gpg_agent_env="${TMPDIR:-/tmp}/gpg-agent.env"
|
||||
|
||||
# Start gpg-agent if not started.
|
||||
if ! ps -U "$USER" -o ucomm | grep -q gpg-agent; then
|
||||
eval "$(gpg-agent --daemon | tee "$_gpg_agent_env")"
|
||||
else
|
||||
if [[ -z "$GPG_AGENT_INFO" ]]; then
|
||||
# Export environment variables.
|
||||
source "$_gpg_agent_env" 2> /dev/null
|
||||
|
||||
# Start gpg-agent if not started.
|
||||
if ! ps -U "$USER" -o pid,ucomm | grep -q -- "${${${(s.:.)GPG_AGENT_INFO}[2]}:--1} gpg-agent"; then
|
||||
eval "$(gpg-agent --daemon | tee "$_gpg_agent_env")"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Inform gpg-agent of the current TTY for user prompts.
|
||||
|
Submodule modules/history-substring-search/external updated: 1e76804052...9f9fc7d550
@ -5,6 +5,11 @@
|
||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||
#
|
||||
|
||||
# TODO: Make the sections easier to use.
|
||||
open "http://nodejs.org/docs/$(node --version | sed 's/-.*//')/api/all.html#${1}"
|
||||
if [[ -z "$BROWSER" ]]; then
|
||||
print "$0: no web browser defined" >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
# TODO: Make the sections easier to use.
|
||||
"$BROWSER" "http://nodejs.org/docs/$(node --version | sed 's/-.*//')/api/all.html#${1}"
|
||||
|
||||
|
@ -17,7 +17,7 @@ if (( $+functions[nvm_version] )); then
|
||||
version="${$(nvm_version)#v}"
|
||||
fi
|
||||
|
||||
if [[ -n "$version" ]]; then
|
||||
if [[ "$version" == (none|) ]]; then
|
||||
zstyle -s ':prezto:module:node:info:version' format 'version_format'
|
||||
zformat -f version_formatted "$version_format" "v:$version"
|
||||
node_info[version]="$version_formatted"
|
||||
|
@ -1,15 +1,15 @@
|
||||
Ocaml
|
||||
OCaml
|
||||
=====
|
||||
|
||||
Initializes [Ocaml][1] package management.
|
||||
Initializes [OCaml][1] package management.
|
||||
|
||||
OPAM
|
||||
----
|
||||
|
||||
[OPAM][2] is a package manager for Ocaml.
|
||||
[OPAM][2] is a package manager for OCaml.
|
||||
|
||||
This module enables local package installation with OPAM by extending the
|
||||
relevant path and Ocaml variables.
|
||||
relevant path and OCaml variables.
|
||||
|
||||
### Usage
|
||||
|
||||
|
@ -1,5 +1,5 @@
|
||||
#
|
||||
# Initializes Ocaml package management.
|
||||
# Initializes OCaml package management.
|
||||
#
|
||||
# Authors:
|
||||
# Sebastian Wiesner <lunaryorn@gmail.com>
|
||||
|
@ -30,10 +30,6 @@ Perlbrew
|
||||
An alternative to the above is to use [Perlbrew][2], which allows for the
|
||||
management of multiple, isolated Perl installations in the home directory.
|
||||
|
||||
You can specify the perlbrew location so the environment is automatically loaded.
|
||||
|
||||
zstyle ':prezto:module:perl:perlbrew' location '/path/to/perlbrew'
|
||||
|
||||
Aliases
|
||||
-------
|
||||
|
||||
|
@ -29,13 +29,6 @@ if [[ "$OSTYPE" == darwin* ]]; then
|
||||
|
||||
unset perl_path
|
||||
unset cache_file
|
||||
|
||||
# Perlbrew
|
||||
zstyle -s ':prezto:module:perl:perlbrew' location '_perlbrew_root'
|
||||
if [[ -s "${_perlbrew_root}/etc/bashrc" ]]; then
|
||||
export PERLBREW_ROOT="${_perlbrew_root}"
|
||||
source "${_perlbrew_root}/etc/bashrc"
|
||||
fi
|
||||
fi
|
||||
|
||||
#
|
||||
|
@ -18,7 +18,7 @@ function prompt_sorin_pwd {
|
||||
_prompt_sorin_pwd="$MATCH"
|
||||
unset MATCH
|
||||
else
|
||||
_prompt_sorin_pwd="${${${(@j:/:M)${(@s:/:)pwd}##.#?}:h}%/}/${pwd:t}"
|
||||
_prompt_sorin_pwd="${${${${(@j:/:M)${(@s:/:)pwd}##.#?}:h}%/}//\%/%%}/${${pwd:t}//\%/%%}"
|
||||
fi
|
||||
}
|
||||
|
||||
|
@ -16,9 +16,12 @@ elif (( $+commands[pyenv] )); then
|
||||
eval "$(pyenv init -)"
|
||||
|
||||
# Prepend PEP 370 per user site packages directory, which defaults to
|
||||
# ~/Library/Python on Mac OS X and ~/.local elsewhere, to PATH.
|
||||
# ~/Library/Python on Mac OS X and ~/.local elsewhere, to PATH. The
|
||||
# path can be overridden using PYTHONUSERBASE.
|
||||
else
|
||||
if [[ "$OSTYPE" == darwin* ]]; then
|
||||
if [[ -n "$PYTHONUSERBASE" ]]; then
|
||||
path=($PYTHONUSERBASE/bin $path)
|
||||
elif [[ "$OSTYPE" == darwin* ]]; then
|
||||
path=($HOME/Library/Python/*/bin(N) $path)
|
||||
else
|
||||
# This is subject to change.
|
||||
|
@ -15,7 +15,7 @@ fi
|
||||
# Auto Start
|
||||
#
|
||||
|
||||
if [[ -z "$STY" && ( -z "$INSIDE_EMACS" || -z "$EMACS" || -z "$VIM" ) ]] && ( \
|
||||
if [[ -z "$STY" && -z "$EMACS" && -z "$VIM" ]] && ( \
|
||||
( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:screen:auto-start' remote ) ||
|
||||
( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:screen:auto-start' local ) \
|
||||
); then
|
||||
|
@ -3,7 +3,7 @@ Spectrum
|
||||
|
||||
Provides for easier use of 256 colors and effects.
|
||||
|
||||
To learn more about text formatting, read [That 256 Color Thing][1].
|
||||
To learn more about text formatting, read [A Guide to 256 Color Codes][1].
|
||||
|
||||
Variables
|
||||
---------
|
||||
@ -87,6 +87,6 @@ Authors
|
||||
- [P.C. Shyamshankar](https://github.com/sykora)
|
||||
- [Sorin Ionescu](https://github.com/sorin-ionescu)
|
||||
|
||||
[1]: http://lucentbeing.com/blog/that-256-color-thing/
|
||||
[1]: http://lucentbeing.com/writing/archives/a-guide-to-256-color-codes/
|
||||
[2]: https://github.com/sorin-ionescu/prezto/issues
|
||||
|
||||
|
@ -25,7 +25,7 @@ if [[ ! -S "$SSH_AUTH_SOCK" ]]; then
|
||||
source "$_ssh_agent_env" 2> /dev/null
|
||||
|
||||
# Start ssh-agent if not started.
|
||||
if ! ps -U "$USER" -o pid,ucomm | grep -q "${SSH_AGENT_PID} ssh-agent"; then
|
||||
if ! ps -U "$USER" -o pid,ucomm | grep -q -- "${SSH_AGENT_PID:--1} ssh-agent"; then
|
||||
eval "$(ssh-agent | sed '/^echo /d' | tee "$_ssh_agent_env")"
|
||||
fi
|
||||
fi
|
||||
|
@ -27,7 +27,7 @@ To enable highlighting for this module only, add the following line to
|
||||
### Highlighters
|
||||
|
||||
Syntax highlighting is accomplished by pluggable [highlighters][2]. This module
|
||||
enables the *main*, *brackets*, and *cursor* highlighters by default.
|
||||
only enables the *main* highlighter by default.
|
||||
|
||||
To enable all highlighters, add the following to *zpreztorc*:
|
||||
|
||||
|
Submodule modules/syntax-highlighting/external updated: f289a9f8e7...3dc5741900
@ -20,12 +20,15 @@ following line to *zpreztorc*:
|
||||
|
||||
zstyle ':prezto:module:tmux:auto-start' remote 'yes'
|
||||
|
||||
In both cases, it will create a background session named _#Prezto_ and attach
|
||||
every new shell to it.
|
||||
In both cases, it will create a background session named _prezto_ if the tmux
|
||||
server is not started.
|
||||
|
||||
To avoid keeping open sessions, this module sets `destroy-unattached off` on
|
||||
the background session and `destroy-unattached on` on every other session
|
||||
(global setting).
|
||||
With `auto-start` enabled, you may want to control how multiple sessions are
|
||||
managed. The `destroy-unattached` option of tmux controls if the unattached
|
||||
sessions must be kept alive, making sessions available for later use, configured
|
||||
in *tmux.conf*:
|
||||
|
||||
set-option -g destroy-unattached [on | off]
|
||||
|
||||
Aliases
|
||||
-------
|
||||
@ -54,6 +57,7 @@ Authors
|
||||
- [Sorin Ionescu](https://github.com/sorin-ionescu)
|
||||
- [Colin Hebert](https://github.com/ColinHebert)
|
||||
- [Georges Discry](https://github.com/gdiscry)
|
||||
- [Xavier Cambar](https://github.com/xcambar)
|
||||
|
||||
[1]: http://tmux.sourceforge.net
|
||||
[2]: https://github.com/sorin-ionescu/prezto/issues/62
|
||||
|
@ -5,6 +5,7 @@
|
||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||
# Colin Hebert <hebert.colin@gmail.com>
|
||||
# Georges Discry <georges@discry.be>
|
||||
# Xavier Cambar <xcambar@gmail.com>
|
||||
#
|
||||
|
||||
# Return if requirements are not found.
|
||||
@ -16,31 +17,22 @@ fi
|
||||
# Auto Start
|
||||
#
|
||||
|
||||
if [[ -z "$TMUX" && ( -z "$INSIDE_EMACS" || -z "$EMACS" || -z "$VIM" ) ]] && ( \
|
||||
if [[ -z "$TMUX" && -z "$EMACS" && -z "$VIM" ]] && ( \
|
||||
( [[ -n "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' remote ) ||
|
||||
( [[ -z "$SSH_TTY" ]] && zstyle -t ':prezto:module:tmux:auto-start' local ) \
|
||||
); then
|
||||
tmux_session='prezto'
|
||||
|
||||
if ! tmux has-session -t "$tmux_session" 2> /dev/null; then
|
||||
# Ensure that tmux server is started.
|
||||
tmux start-server
|
||||
|
||||
# Disable the destruction of unattached sessions globally.
|
||||
tmux set-option -g destroy-unattached off &> /dev/null
|
||||
|
||||
# Create a new session.
|
||||
tmux new-session -d -s "$tmux_session"
|
||||
|
||||
# Disable the destruction of the new, unattached session.
|
||||
tmux set-option -t "$tmux_session" destroy-unattached off &> /dev/null
|
||||
|
||||
# Enable the destruction of unattached sessions globally to prevent
|
||||
# an abundance of open, detached sessions.
|
||||
tmux set-option -g destroy-unattached on &> /dev/null
|
||||
# Create a 'prezto' session if no session has been defined in tmux.conf.
|
||||
if ! tmux has-session 2> /dev/null; then
|
||||
tmux_session='prezto'
|
||||
tmux \
|
||||
new-session -d -s "$tmux_session" \; \
|
||||
set-option -t "$tmux_session" destroy-unattached off &> /dev/null
|
||||
fi
|
||||
|
||||
exec tmux new-session -t "$tmux_session"
|
||||
# Attach to the 'prezto' session or to the last session used.
|
||||
exec tmux attach-session
|
||||
fi
|
||||
|
||||
#
|
||||
|
@ -66,9 +66,9 @@ if is-callable 'dircolors'; then
|
||||
|
||||
if zstyle -t ':prezto:module:utility:ls' color; then
|
||||
if [[ -s "$HOME/.dir_colors" ]]; then
|
||||
eval "$(dircolors "$HOME/.dir_colors")"
|
||||
eval "$(dircolors --sh "$HOME/.dir_colors")"
|
||||
else
|
||||
eval "$(dircolors)"
|
||||
eval "$(dircolors --sh)"
|
||||
fi
|
||||
|
||||
alias ls="$aliases[ls] --color=auto"
|
||||
|
@ -152,4 +152,3 @@ zstyle ':prezto:module:prompt' theme 'sorin'
|
||||
|
||||
# Auto start a session when Zsh is launched in a SSH connection.
|
||||
# zstyle ':prezto:module:tmux:auto-start' remote 'yes'
|
||||
|
||||
|
Reference in New Issue
Block a user