1
0
mirror of https://github.com/dcarrillo/prezto.git synced 2025-07-01 20:59:26 +00:00

Compare commits

..

32 Commits

Author SHA1 Message Date
b2d84afacf don't overwrite the WORKON_HOME env var if the user has already set it 2014-10-10 22:39:13 -07:00
7629171239 support skip-virtualenvwrapper-init zstyle in python module to avoid auto-sourcing of virtualenvwrapper.sh 2014-10-10 22:37:42 -07:00
53bd555c6d Try lesspipe in addition to lesspipe.sh for LESSOPEN
Debian based systems have `lesspipe`, without '.sh' suffix.
Since `$commands` is an associative array, we do index search and set
the input preprocessor on first match.
2014-10-10 19:00:46 -04:00
86ba5b69d3 Ignore case in filenames
Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
2014-10-10 18:55:26 -04:00
5791c07d48 Only print fortunes in terminals 2014-10-10 18:53:44 -04:00
34a50c2550 Add homebrew-cask aliases to homebrew module
Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
2014-10-10 18:51:14 -04:00
417b9d429d Update OPAM setup
Recent OPAM versions generate more elaborate setup code.
2014-10-10 18:38:32 -04:00
fea08d4e50 [Fix #669] Do not use lazy virtualenvwrapper
Lazy virtualenvwrapper completion crashes Zsh.

Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
2014-10-10 18:35:33 -04:00
d3f1441481 [Fix #595] Simplify the handling of the Terminal.app proxy icon 2014-10-09 23:38:15 -04:00
a84ac5b002 Only one newline at end of file 2014-10-09 23:38:15 -04:00
10c33ec9a4 Convert tabs to spaces 2014-10-09 23:38:13 -04:00
9b1f39f267 [Fix #563] Control+Arrow keys are not in the terminfo database 2014-10-09 13:08:21 -04:00
36ade25eb6 [Fix #652] Execute abs with sudo 2014-10-09 00:02:56 -04:00
8f711d64b5 [Fix #594] Remove quotes surrounding associative array key 2014-10-06 23:36:33 -04:00
c4b50ec1a0 [Fix #635] Use $BROWSER to open node documentation 2014-10-06 18:02:45 -04:00
62198b0326 Display full command line on suggestion for the kill command
For the zsh suggestion for the 'kill' command, show full command line
(command: usually with arguments) instead of only the executable name (comm).
2014-10-06 17:03:53 -04:00
b4884d4d45 [Fix #626] Escape '%' in path 2014-10-06 16:54:21 -04:00
abfc4ab6e5 [Fix #648] Do not instruct users to call editor-info 2014-10-06 16:50:03 -04:00
657e8a16f4 [Fix #689] Use GPG_AGENT_INFO instead of GPG_AGENT_PID
GPG_AGENT_PID may not be defined. Also, source gpg-agent.env before
checking the PID.
2014-10-06 16:42:22 -04:00
ea25ccf62c Set default GPG_AGENT_PID for grep
If `GPG_AGENT_PID` is unset, grep will succeed if another gpg-agent is
running as it will match the string `gpg-agent` where the PID was an
empty string. Set a default value for grep to a value that will never
match if unset, i.e. -1.
2014-10-05 21:46:58 -04:00
3e88b8bcdc Set default SSH_AGENT_PID for grep
If `SSH_AGENT_PID` is unset, grep will succeed if another ssh-agent is
running as it will match the string `ssh-agent` where the PID was an
empty string. Set a default value for grep to a value that will never
match if unset, i.e. -1.

Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
2014-10-05 21:44:20 -04:00
e892d7f3c7 Fix broken link to 256 color formatting blogpost
Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
2014-10-05 21:26:08 -04:00
4e4a6fcc63 Don't set node-info if version is 'none'
This is done to make it easier to not show node-info in themes
when no node version is currently in use. This is consistent with
how the Python module's python-info works.

Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
2014-10-05 21:22:38 -04:00
3e8349ddde Use the x command for unrar and rar to preserve paths
unrar and rar will discard everything up to the file name when extracting
with `e`. This breaks extraction of archives that have files with duplicate
file names and ones where the paths are important. The `x` command
extracts with the full path instead.
2014-10-05 21:14:01 -04:00
fdb406f917 Fix typo 2014-10-05 21:12:54 -04:00
493bf302f6 Ensure dircolors uses sh syntax
Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
2014-10-05 21:12:54 -04:00
a217af99f3 Prezto only enables the main syntax highlighter
Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
2014-10-05 21:12:53 -04:00
06cc5088aa [Fix #630] Zsh v4.3.17 is the minimum required 2014-10-05 21:12:42 -04:00
5088ca4839 Bump minimum supported Zsh to v4.3.11
zsh-syntax-highlighting requires this version.

Signed-off-by: Sorin Ionescu <sorin.ionescu@gmail.com>
2014-10-05 20:25:25 -04:00
0f696fc206 Update external syntax-highlighting 2014-10-05 20:16:26 -04:00
96bcf813b7 Update external history-substring-search 2014-10-05 20:15:43 -04:00
fe8f9a9b5b Update external completions 2014-10-05 20:14:25 -04:00
134 changed files with 138 additions and 251 deletions

View File

@ -39,4 +39,3 @@ improve its performance, do not hesitate to fork and send pull requests.
[3]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html [3]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
[4]: https://help.github.com/articles/using-pull-requests [4]: https://help.github.com/articles/using-pull-requests
[5]: http://daringfireball.net/projects/markdown/syntax#img [5]: http://daringfireball.net/projects/markdown/syntax#img

View File

@ -8,8 +8,8 @@ and prompt themes.
Installation Installation
------------ ------------
Prezto will work with any recent release of Zsh, but the minimum recommended Prezto will work with any recent release of Zsh, but the minimum required
version is 4.3.11. version is 4.3.17.
1. Launch Zsh: 1. Launch Zsh:
@ -114,4 +114,3 @@ SOFTWARE.
[6]: http://gitref.org [6]: http://gitref.org
[7]: http://www.bash2zsh.com/zsh_refcard/refcard.pdf [7]: http://www.bash2zsh.com/zsh_refcard/refcard.pdf
[8]: http://grml.org/zsh/zsh-lovers.html [8]: http://grml.org/zsh/zsh-lovers.html

View File

@ -10,7 +10,7 @@
# #
# Check for the minimum supported version. # 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 if ! autoload -Uz is-at-least || ! is-at-least "$min_zsh_version"; then
print "prezto: old shell detected, minimum required: $min_zsh_version" >&2 print "prezto: old shell detected, minimum required: $min_zsh_version" >&2
return 1 return 1
@ -111,4 +111,3 @@ unset zfunction{s,}
zstyle -a ':prezto:load' pmodule 'pmodules' zstyle -a ':prezto:load' pmodule 'pmodules'
pmodload "$pmodules[@]" pmodload "$pmodules[@]"
unset pmodules unset pmodules

View File

@ -102,10 +102,10 @@ Node.js
Provides utility functions for Node.js and loads npm completion. Provides utility functions for Node.js and loads npm completion.
Ocaml OCaml
----- -----
Initializes Ocaml package management. Initializes OCaml package management.
OSX OSX
--- ---
@ -192,4 +192,3 @@ Yum
--- ---
Defines yum aliases. Defines yum aliases.

View File

@ -38,4 +38,3 @@ Authors
- [Sorin Ionescu](https://github.com/sorin-ionescu) - [Sorin Ionescu](https://github.com/sorin-ionescu)
[1]: https://github.com/sorin-ionescu/prezto/issues [1]: https://github.com/sorin-ionescu/prezto/issues

View File

@ -11,4 +11,3 @@
_arguments \ _arguments \
'(-v --verbose)'{-v,--remove}'[verbose archive listing]' \ '(-v --verbose)'{-v,--remove}'[verbose archive listing]' \
"*::archive file:_files -g '(#i)*.(tar|tgz|tbz|tbz2|txz|tlz|gz|bz2|xz|lzma|Z|zip|rar|7z)(-.)'" && return 0 "*::archive file:_files -g '(#i)*.(tar|tgz|tbz|tbz2|txz|tlz|gz|bz2|xz|lzma|Z|zip|rar|7z)(-.)'" && return 0

View File

@ -11,4 +11,3 @@
_arguments \ _arguments \
'(-r --remove)'{-r,--remove}'[remove archive]' \ '(-r --remove)'{-r,--remove}'[remove archive]' \
"*::archive file:_files -g '(#i)*.(tar|tgz|tbz|tbz2|txz|tlz|gz|bz2|xz|lzma|Z|zip|rar|7z|deb)(-.)'" && return 0 "*::archive file:_files -g '(#i)*.(tar|tgz|tbz|tbz2|txz|tlz|gz|bz2|xz|lzma|Z|zip|rar|7z|deb)(-.)'" && return 0

View File

@ -30,7 +30,7 @@ while (( $# > 0 )); do
continue continue
fi fi
case "$1" in case "$1:l" in
(*.tar.gz|*.tgz) tar t${verbose:+v}vzf "$1" ;; (*.tar.gz|*.tgz) tar t${verbose:+v}vzf "$1" ;;
(*.tar.bz2|*.tbz|*.tbz2) tar t${verbose:+v}jf "$1" ;; (*.tar.bz2|*.tbz|*.tbz2) tar t${verbose:+v}jf "$1" ;;
(*.tar.xz|*.txz) tar --xz --help &> /dev/null \ (*.tar.xz|*.txz) tar --xz --help &> /dev/null \
@ -46,11 +46,10 @@ while (( $# > 0 )); do
|| rar ${${verbose:+v}:-l} "$1" ;; || rar ${${verbose:+v}:-l} "$1" ;;
(*.7z) 7za l "$1" ;; (*.7z) 7za l "$1" ;;
(*) (*)
print "$0: cannot list: $1" >&2 print "$0: cannot list: $1" >&2
success=1 success=1
;; ;;
esac esac
shift shift
done done

View File

@ -37,7 +37,7 @@ while (( $# > 0 )); do
success=0 success=0
file_name="${1:t}" file_name="${1:t}"
extract_dir="${file_name:r}" extract_dir="${file_name:r}"
case "$1" in case "$1:l" in
(*.tar.gz|*.tgz) tar xvzf "$1" ;; (*.tar.gz|*.tgz) tar xvzf "$1" ;;
(*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$1" ;; (*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$1" ;;
(*.tar.xz|*.txz) tar --xz --help &> /dev/null \ (*.tar.xz|*.txz) tar --xz --help &> /dev/null \
@ -54,8 +54,8 @@ while (( $# > 0 )); do
(*.Z) uncompress "$1" ;; (*.Z) uncompress "$1" ;;
(*.zip) unzip "$1" -d $extract_dir ;; (*.zip) unzip "$1" -d $extract_dir ;;
(*.rar) unrar &> /dev/null \ (*.rar) unrar &> /dev/null \
&& unrar e -ad "$1" \ && unrar x -ad "$1" \
|| rar e -ad "$1" ;; || rar x -ad "$1" ;;
(*.7z) 7za x "$1" ;; (*.7z) 7za x "$1" ;;
(*.deb) (*.deb)
mkdir -p "$extract_dir/control" mkdir -p "$extract_dir/control"
@ -76,4 +76,3 @@ while (( $# > 0 )); do
(( $success == 0 )) && (( $remove_archive == 0 )) && rm "$1" (( $success == 0 )) && (( $remove_archive == 0 )) && rm "$1"
shift shift
done done

View File

@ -13,4 +13,3 @@ Authors
[1]: https://code.launchpad.net/command-not-found [1]: https://code.launchpad.net/command-not-found
[2]: https://github.com/sorin-ionescu/prezto/issues [2]: https://github.com/sorin-ionescu/prezto/issues

View File

@ -15,4 +15,3 @@ elif [[ -s '/usr/share/doc/pkgfile/command-not-found.zsh' ]]; then
else else
return 1 return 1
fi fi

View File

@ -21,4 +21,3 @@ Authors
[1]: https://github.com/zsh-users/zsh-completions [1]: https://github.com/zsh-users/zsh-completions
[2]: https://github.com/sorin-ionescu/prezto/issues [2]: https://github.com/sorin-ionescu/prezto/issues

View File

@ -116,7 +116,7 @@ zstyle ':completion:*:(rm|kill|diff):*' ignore-line other
zstyle ':completion:*:rm:*' file-patterns '*:all-files' zstyle ':completion:*:rm:*' file-patterns '*:all-files'
# Kill # 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:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;36=0=01'
zstyle ':completion:*:*:kill:*' menu yes select zstyle ':completion:*:*:kill:*' menu yes select
zstyle ':completion:*:*:kill:*' force-list always zstyle ':completion:*:*:kill:*' force-list always
@ -146,4 +146,3 @@ zstyle ':completion:*:ssh:*' group-order users hosts-domain hosts-host users hos
zstyle ':completion:*:(ssh|scp|rsync):*:hosts-host' ignored-patterns '*(.|:)*' loopback ip6-loopback localhost ip6-localhost broadcasthost zstyle ':completion:*:(ssh|scp|rsync):*:hosts-host' ignored-patterns '*(.|:)*' loopback ip6-loopback localhost ip6-localhost broadcasthost
zstyle ':completion:*:(ssh|scp|rsync):*:hosts-domain' ignored-patterns '<->.<->.<->.<->' '^[-[:alnum:]]##(.[-[:alnum:]]##)##' '*@*' zstyle ':completion:*:(ssh|scp|rsync):*:hosts-domain' ignored-patterns '<->.<->.<->.<->' '^[-[:alnum:]]##(.[-[:alnum:]]##)##' '*@*'
zstyle ':completion:*:(ssh|scp|rsync):*:hosts-ipaddr' ignored-patterns '^(<->.<->.<->.<->|(|::)([[:xdigit:].]##:(#c,2))##(|%*))' '127.0.0.<->' '255.255.255.255' '::1' 'fe80::*' zstyle ':completion:*:(ssh|scp|rsync):*:hosts-ipaddr' ignored-patterns '^(<->.<->.<->.<->|(|::)([[:xdigit:].]##:(#c,2))##(|%*))' '127.0.0.<->' '255.255.255.255' '::1' 'fe80::*'

View File

@ -33,4 +33,3 @@ Authors
- [Sorin Ionescu](https://github.com/sorin-ionescu) - [Sorin Ionescu](https://github.com/sorin-ionescu)
[1]: https://github.com/sorin-ionescu/prezto/issues [1]: https://github.com/sorin-ionescu/prezto/issues

View File

@ -28,4 +28,3 @@ unsetopt CLOBBER # Do not overwrite existing files with > and >>.
alias d='dirs -v' alias d='dirs -v'
for index ({1..9}) alias "$index"="cd +${index}"; unset index for index ({1..9}) alias "$index"="cd +${index}"; unset index

View File

@ -39,4 +39,3 @@ Authors
[1]: http://wiki.debian.org/Teams/Dpkg [1]: http://wiki.debian.org/Teams/Dpkg
[2]: https://github.com/sorin-ionescu/prezto/issues [2]: https://github.com/sorin-ionescu/prezto/issues

View File

@ -23,4 +23,3 @@ rm "$clone_script"
print '#!/bin/sh\n' > "$clone_script" print '#!/bin/sh\n' > "$clone_script"
print "aptitude install ${package_list}\n" >> "$clone_script" print "aptitude install ${package_list}\n" >> "$clone_script"
chmod +x "$clone_script" chmod +x "$clone_script"

View File

@ -34,4 +34,3 @@ Commands:
EOF EOF
;; ;;
esac esac

View File

@ -12,4 +12,3 @@ MAKEFLAGS='' time fakeroot make-kpkg \
--revision "$(date +"%Y%m%d")" \ --revision "$(date +"%Y%m%d")" \
kernel_image \ kernel_image \
kernel_headers kernel_headers

View File

@ -55,4 +55,3 @@ alias deb-build='time dpkg-buildpackage -rfakeroot -us -uc'
# Removes all kernel images and headers, except for the ones in use. # Removes all kernel images and headers, except for the ones in use.
alias deb-kclean='sudo aptitude remove -P "?and(~i~nlinux-(ima|hea) ?not(~n`uname -r`))"' alias deb-kclean='sudo aptitude remove -P "?and(~i~nlinux-(ima|hea) ?not(~n`uname -r`))"'

View File

@ -49,8 +49,7 @@ To indicate when the editor is completing, add the following to your
zstyle ':prezto:module:editor:info:completing' format '...' zstyle ':prezto:module:editor:info:completing' format '...'
Then add `$editor_info[context]`, where context is *keymap*, *insert*, or Then add `$editor_info[context]`, where context is *keymap*, *insert*, or
*overwrite*, to `$PROMPT` or `$RPROMPT` and call `editor-info` in the *overwrite*, to `$PROMPT` or `$RPROMPT`.
`prompt_name_preexec` hook function.
Authors Authors
------- -------
@ -60,4 +59,3 @@ Authors
- [Sorin Ionescu](https://github.com/sorin-ionescu) - [Sorin Ionescu](https://github.com/sorin-ionescu)
[1]: https://github.com/sorin-ionescu/oh-my-zsh/issues [1]: https://github.com/sorin-ionescu/oh-my-zsh/issues

View File

@ -28,40 +28,42 @@ WORDCHARS='*?_-.[]~&;!#$%^(){}<>'
zmodload zsh/terminfo zmodload zsh/terminfo
typeset -gA key_info typeset -gA key_info
key_info=( key_info=(
'Control' '\C-' 'Control' '\C-'
'Escape' '\e' 'ControlLeft' '\e[1;5D \e[5D \e\e[D \eOd'
'Meta' '\M-' 'ControlRight' '\e[1;5C \e[5C \e\e[C \eOc'
'Backspace' "^?" 'Escape' '\e'
'Delete' "^[[3~" 'Meta' '\M-'
'F1' "$terminfo[kf1]" 'Backspace' "^?"
'F2' "$terminfo[kf2]" 'Delete' "^[[3~"
'F3' "$terminfo[kf3]" 'F1' "$terminfo[kf1]"
'F4' "$terminfo[kf4]" 'F2' "$terminfo[kf2]"
'F5' "$terminfo[kf5]" 'F3' "$terminfo[kf3]"
'F6' "$terminfo[kf6]" 'F4' "$terminfo[kf4]"
'F7' "$terminfo[kf7]" 'F5' "$terminfo[kf5]"
'F8' "$terminfo[kf8]" 'F6' "$terminfo[kf6]"
'F9' "$terminfo[kf9]" 'F7' "$terminfo[kf7]"
'F10' "$terminfo[kf10]" 'F8' "$terminfo[kf8]"
'F11' "$terminfo[kf11]" 'F9' "$terminfo[kf9]"
'F12' "$terminfo[kf12]" 'F10' "$terminfo[kf10]"
'Insert' "$terminfo[kich1]" 'F11' "$terminfo[kf11]"
'Home' "$terminfo[khome]" 'F12' "$terminfo[kf12]"
'PageUp' "$terminfo[kpp]" 'Insert' "$terminfo[kich1]"
'End' "$terminfo[kend]" 'Home' "$terminfo[khome]"
'PageDown' "$terminfo[knp]" 'PageUp' "$terminfo[kpp]"
'Up' "$terminfo[kcuu1]" 'End' "$terminfo[kend]"
'Left' "$terminfo[kcub1]" 'PageDown' "$terminfo[knp]"
'Down' "$terminfo[kcud1]" 'Up' "$terminfo[kcuu1]"
'Right' "$terminfo[kcuf1]" 'Left' "$terminfo[kcub1]"
'BackTab' "$terminfo[kcbt]" 'Down' "$terminfo[kcud1]"
'Right' "$terminfo[kcuf1]"
'BackTab' "$terminfo[kcbt]"
) )
# Set empty $key_info values to an invalid UTF-8 sequence to induce silent # Set empty $key_info values to an invalid UTF-8 sequence to induce silent
# bindkey failure. # bindkey failure.
for key in "${(k)key_info[@]}"; do for key in "${(k)key_info[@]}"; do
if [[ -z "$key_info[$key]" ]]; then if [[ -z "$key_info[$key]" ]]; then
key_info["$key"]='<27>' key_info[$key]='<27>'
fi fi
done done
@ -206,10 +208,10 @@ bindkey -d
# Emacs Key Bindings # Emacs Key Bindings
# #
for key ("$key_info[Escape]"{B,b}) bindkey -M emacs "$key" emacs-backward-word for key in "$key_info[Escape]"{B,b} "${(s: :)key_info[ControlLeft]}"
for key ("$key_info[Escape]"{F,f}) bindkey -M emacs "$key" emacs-forward-word bindkey -M emacs "$key" emacs-backward-word
bindkey -M emacs "$key_info[Escape]$key_info[Left]" emacs-backward-word for key in "$key_info[Escape]"{F,f} "${(s: :)key_info[ControlRight]}"
bindkey -M emacs "$key_info[Escape]$key_info[Right]" emacs-forward-word bindkey -M emacs "$key" emacs-forward-word
# Kill to the beginning of the line. # Kill to the beginning of the line.
for key in "$key_info[Escape]"{K,k} for key in "$key_info[Escape]"{K,k}
@ -325,4 +327,3 @@ else
fi fi
unset key{,map,bindings} unset key{,map,bindings}

View File

@ -23,4 +23,3 @@ Authors
- [Sorin Ionescu](https://github.com/sorin-ionescu) - [Sorin Ionescu](https://github.com/sorin-ionescu)
[1]: https://github.com/sorin-ionescu/prezto/issues [1]: https://github.com/sorin-ionescu/prezto/issues

View File

@ -55,4 +55,3 @@ if zstyle -t ':prezto:environment:termcap' color; then
export LESS_TERMCAP_ue=$'\E[0m' # Ends underline. export LESS_TERMCAP_ue=$'\E[0m' # Ends underline.
export LESS_TERMCAP_us=$'\E[01;32m' # Begins underline. export LESS_TERMCAP_us=$'\E[01;32m' # Begins underline.
fi fi

View File

@ -36,4 +36,3 @@ Authors
[3]: https://github.com/rupa/z [3]: https://github.com/rupa/z
[4]: https://github.com/rupa/v [4]: https://github.com/rupa/v
[5]: https://github.com/sorin-ionescu/prezto/issues [5]: https://github.com/sorin-ionescu/prezto/issues

View File

@ -51,4 +51,3 @@ function fasd_cd {
# Changes the current working directory interactively. # Changes the current working directory interactively.
alias j='fasd_cd -i' alias j='fasd_cd -i'

View File

@ -332,4 +332,3 @@ Authors
[6]: https://github.com/sorin-ionescu/prezto/issues [6]: https://github.com/sorin-ionescu/prezto/issues
[7]: https://github.com/sorin-ionescu/prezto/issues/219 [7]: https://github.com/sorin-ionescu/prezto/issues/219
[8]: http://www.kernel.org/pub/software/scm/git/docs/git-log.html [8]: http://www.kernel.org/pub/software/scm/git/docs/git-log.html

View File

@ -179,4 +179,3 @@ alias gwc='git clean -n'
alias gwC='git clean -f' alias gwC='git clean -f'
alias gwx='git rm -r' alias gwx='git rm -r'
alias gwX='git rm -rf' alias gwX='git rm -rf'

View File

@ -45,4 +45,3 @@ case "$state" in
esac esac
return $ret return $ret

View File

@ -9,4 +9,3 @@
# #
_arguments '1:url:' && return 0 _arguments '1:url:' && return 0

View File

@ -16,4 +16,3 @@ _arguments "1:toggle:((
on\:'enable in-prompt information for the current repository' on\:'enable in-prompt information for the current repository'
off\:'disable in-prompt information for the current repository' off\:'disable in-prompt information for the current repository'
))" && return 0 ))" && return 0

View File

@ -38,4 +38,3 @@ case "$state" in
esac esac
return $ret return $ret

View File

@ -24,4 +24,3 @@ done < <(
) )
_describe -t submodule 'submodules' submodules && return 0 _describe -t submodule 'submodules' submodules && return 0

View File

@ -18,4 +18,3 @@ if [[ -n "$ref" ]]; then
else else
return 1 return 1
fi fi

View File

@ -18,4 +18,3 @@ git fsck 2> /dev/null \
--no-walk \ --no-walk \
--stdin \ --stdin \
--pretty=format:${_git_log_oneline_format} --pretty=format:${_git_log_oneline_format}

View File

@ -14,4 +14,3 @@ else
print "$0: not a repository: $PWD" >&2 print "$0: not a repository: $PWD" >&2
return 1 return 1
fi fi

View File

@ -56,4 +56,3 @@ else
print "$0: not a Git repository or remote not set" >&2 print "$0: not a Git repository or remote not set" >&2
return 1 return 1
fi fi

View File

@ -20,4 +20,3 @@ if (( $+commands[curl] )); then
else else
print "$0: command not found: curl" >&2 print "$0: command not found: curl" >&2
fi fi

View File

@ -421,4 +421,3 @@ function git-info {
} }
git-info "$@" git-info "$@"

View File

@ -14,4 +14,3 @@ else
print "$0: not a repository work tree: $PWD" >&2 print "$0: not a repository work tree: $PWD" >&2
return 1 return 1
fi fi

View File

@ -20,4 +20,3 @@ if [[ -f "$(git-dir)/refs/stash" ]]; then
fi fi
fi fi
fi fi

View File

@ -20,4 +20,3 @@ git fsck --unreachable 2> /dev/null \
--merges \ --merges \
--no-walk \ --no-walk \
--stdin --stdin

View File

@ -16,4 +16,3 @@ for commit in "$@"; do
git update-ref \ git update-ref \
-m "$(git log -1 --pretty="format:%s" "$commit")" refs/stash "$commit" -m "$(git log -1 --pretty="format:%s" "$commit")" refs/stash "$commit"
done done

View File

@ -30,4 +30,3 @@ git-submodule-remove "$src"
git submodule add "$url" "$dst" git submodule add "$url" "$dst"
return 0 return 0

View File

@ -25,4 +25,3 @@ rm -rf "${1}"
rm -rf "$(git-dir)/modules/${1}" rm -rf "$(git-dir)/modules/${1}"
return 0 return 0

View File

@ -15,4 +15,3 @@ pmodload 'helper'
# Source module files. # Source module files.
source "${0:h}/alias.zsh" source "${0:h}/alias.zsh"

View File

@ -30,4 +30,3 @@ Authors
- [Sorin Ionescu](https://github.com/sorin-ionescu) - [Sorin Ionescu](https://github.com/sorin-ionescu)
[1]: https://github.com/sorin-ionescu/prezto/issues [1]: https://github.com/sorin-ionescu/prezto/issues

View File

@ -58,4 +58,3 @@ for _gnu_utility_cmd in "${_gnu_utility_cmds[@]}"; do
done done
unset _gnu_utility_{p,cmds,cmd,pcmd} unset _gnu_utility_{p,cmds,cmd,pcmd}

View File

@ -24,4 +24,3 @@ Authors
[1]: http://www.gnupg.org [1]: http://www.gnupg.org
[2]: http://linux.die.net/man/1/gpg-agent [2]: http://linux.die.net/man/1/gpg-agent
[3]: https://github.com/sorin-ionescu/prezto/issues [3]: https://github.com/sorin-ionescu/prezto/issues

View File

@ -15,11 +15,14 @@ _gpg_agent_conf="$HOME/.gnupg/gpg-agent.conf"
_gpg_agent_env="${TMPDIR:-/tmp}/gpg-agent.env" _gpg_agent_env="${TMPDIR:-/tmp}/gpg-agent.env"
# Start gpg-agent if not started. # Start gpg-agent if not started.
if ! ps -U "$USER" -o ucomm | grep -q gpg-agent; then if [[ -z "$GPG_AGENT_INFO" ]]; then
eval "$(gpg-agent --daemon | tee "$_gpg_agent_env")"
else
# Export environment variables. # Export environment variables.
source "$_gpg_agent_env" 2> /dev/null 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 fi
# Inform gpg-agent of the current TTY for user prompts. # Inform gpg-agent of the current TTY for user prompts.
@ -41,4 +44,3 @@ unset _gpg_agent_{conf,env}
if [[ -n "$SSH_CONNECTION" ]]; then if [[ -n "$SSH_CONNECTION" ]]; then
export PINENTRY_USER_DATA='USE_CURSES=1' export PINENTRY_USER_DATA='USE_CURSES=1'
fi fi

View File

@ -26,4 +26,3 @@ Authors
[1]: http://www.haskell.org/cabal/ [1]: http://www.haskell.org/cabal/
[2]: https://github.com/sorin-ionescu/prezto/issues [2]: https://github.com/sorin-ionescu/prezto/issues

View File

@ -22,4 +22,3 @@ Authors
- [Sorin Ionescu](https://github.com/sorin-ionescu) - [Sorin Ionescu](https://github.com/sorin-ionescu)
[1]: https://github.com/sorin-ionescu/prezto/issues [1]: https://github.com/sorin-ionescu/prezto/issues

View File

@ -39,4 +39,3 @@ function add-zsh-trap {
} }
add-zsh-trap "$@" add-zsh-trap "$@"

View File

@ -29,4 +29,3 @@ function coalesce {
done done
return 1 return 1
} }

View File

@ -59,4 +59,3 @@ Authors
[1]: https://github.com/zsh-users/zsh-history-substring-search [1]: https://github.com/zsh-users/zsh-history-substring-search
[2]: http://fishshell.com [2]: http://fishshell.com
[3]: https://github.com/sorin-ionescu/prezto/issues [3]: https://github.com/sorin-ionescu/prezto/issues

View File

@ -55,4 +55,3 @@ if [[ -n "$key_info" ]]; then
bindkey -M "$keymap" "$key_info[Down]" history-substring-search-down bindkey -M "$keymap" "$key_info[Down]" history-substring-search-down
done done
fi fi

View File

@ -41,4 +41,3 @@ Authors
[1]: http://zsh.sourceforge.net/Guide/zshguide02.html#l16 [1]: http://zsh.sourceforge.net/Guide/zshguide02.html#l16
[2]: https://github.com/sorin-ionescu/prezto/issues [2]: https://github.com/sorin-ionescu/prezto/issues

View File

@ -6,6 +6,8 @@ Defines Homebrew aliases.
Aliases Aliases
------- -------
### Homebrew
- `brewc` cleans outdated brews and their cached archives. - `brewc` cleans outdated brews and their cached archives.
- `brewC` cleans outdated brews, including keg-only, and their cached archives. - `brewC` cleans outdated brews, including keg-only, and their cached archives.
- `brewi` installs a formula. - `brewi` installs a formula.
@ -15,12 +17,22 @@ Aliases
- `brewu` upgrades Homebrew. - `brewu` upgrades Homebrew.
- `brewx` uninstalls a formula. - `brewx` uninstalls a formula.
### Homebrew Cask
- `cask` is aliased to `brew cask`.
- `caskc` cleans up old cached downloads.
- `caskC` cleans up all cached downloads.
- `caski` installs a cask.
- `caskl` lists installed casks.
- `casks` searches for a cask.
- `caskx` uninstalls a cask.
Authors Authors
------- -------
*The authors of this module should be contacted via the [issue tracker][1].* *The authors of this module should be contacted via the [issue tracker][1].*
- [Sorin Ionescu](https://github.com/sorin-ionescu) - [Sorin Ionescu](https://github.com/sorin-ionescu)
- [Griffin Yourick](https://github.com/tough-griff)
[1]: https://github.com/sorin-ionescu/prezto/issues [1]: https://github.com/sorin-ionescu/prezto/issues

View File

@ -14,6 +14,7 @@ fi
# Aliases # Aliases
# #
# Homebrew
alias brewc='brew cleanup' alias brewc='brew cleanup'
alias brewC='brew cleanup --force' alias brewC='brew cleanup --force'
alias brewi='brew install' alias brewi='brew install'
@ -23,3 +24,11 @@ alias brewu='brew upgrade'
alias brewU='brew update && brew upgrade' alias brewU='brew update && brew upgrade'
alias brewx='brew remove' alias brewx='brew remove'
# Homebrew Cask
alias cask='brew cask'
alias caskc='brew cask cleanup --outdated'
alias caskC='brew cask cleanup'
alias caski='brew cask install'
alias caskl='brew cask list'
alias casks='brew cask search'
alias caskx='brew cask uninstall'

View File

@ -23,4 +23,3 @@ Authors
- [Sorin Ionescu](https://github.com/sorin-ionescu) - [Sorin Ionescu](https://github.com/sorin-ionescu)
[1]: https://github.com/sorin-ionescu/prezto/issues [1]: https://github.com/sorin-ionescu/prezto/issues

View File

@ -32,4 +32,3 @@ alias portU='sudo port selfupdate && sudo port upgrade outdated'
alias portu='sudo port upgrade' alias portu='sudo port upgrade'
alias portX='sudo port -u uninstall' alias portX='sudo port -u uninstall'
alias portx='sudo port uninstall' alias portx='sudo port uninstall'

View File

@ -43,4 +43,3 @@ Authors
[3]: http://nodejs.org/api [3]: http://nodejs.org/api
[4]: https://github.com/sorin-ionescu/prezto/issues [4]: https://github.com/sorin-ionescu/prezto/issues
[5]: https://github.com/creationix/nvm [5]: https://github.com/creationix/nvm

View File

@ -5,6 +5,10 @@
# Sorin Ionescu <sorin.ionescu@gmail.com> # Sorin Ionescu <sorin.ionescu@gmail.com>
# #
# TODO: Make the sections easier to use. if [[ -z "$BROWSER" ]]; then
open "http://nodejs.org/docs/$(node --version | sed 's/-.*//')/api/all.html#${1}" 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}"

View File

@ -17,9 +17,8 @@ if (( $+functions[nvm_version] )); then
version="${$(nvm_version)#v}" version="${$(nvm_version)#v}"
fi fi
if [[ -n "$version" ]]; then if [[ "$version" == (none|) ]]; then
zstyle -s ':prezto:module:node:info:version' format 'version_format' zstyle -s ':prezto:module:node:info:version' format 'version_format'
zformat -f version_formatted "$version_format" "v:$version" zformat -f version_formatted "$version_format" "v:$version"
node_info[version]="$version_formatted" node_info[version]="$version_formatted"
fi fi

View File

@ -29,4 +29,3 @@ if (( $+commands[npm] )); then
unset cache_file unset cache_file
fi fi

View File

@ -1,15 +1,15 @@
Ocaml OCaml
===== =====
Initializes [Ocaml][1] package management. Initializes [OCaml][1] package management.
OPAM 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 This module enables local package installation with OPAM by extending the
relevant path and Ocaml variables. relevant path and OCaml variables.
### Usage ### Usage
@ -25,4 +25,3 @@ Authors
[1]: http://ocaml.org/ [1]: http://ocaml.org/
[2]: http://opam.ocamlpro.com/ [2]: http://opam.ocamlpro.com/
[3]: https://github.com/sorin-ionescu/prezto/issues [3]: https://github.com/sorin-ionescu/prezto/issues

View File

@ -1,15 +1,14 @@
# #
# Initializes Ocaml package management. # Initializes OCaml package management.
# #
# Authors: # Authors:
# Sebastian Wiesner <lunaryorn@gmail.com> # Sebastian Wiesner <lunaryorn@gmail.com>
# #
# Return if requirements are not found. # Return if requirements are not found.
if (( ! $+commands[opam] )); then if [[ ! -f "$HOME/.opam/opam-init/init.zsh" ]]; then
return 1 return 1
fi fi
# Initialize OPAM. # Initialize OPAM.
eval "$(opam config env)" source "$HOME/.opam/opam-init/init.zsh"

View File

@ -9,4 +9,3 @@
# #
_man _man

View File

@ -18,4 +18,3 @@ function mand {
} }
mand "$@" mand "$@"

View File

@ -17,4 +17,3 @@ function manp {
} }
manp "$@" manp "$@"

View File

@ -39,4 +39,3 @@ EOF
end tell end tell
EOF EOF
} }

View File

@ -63,4 +63,3 @@ Authors
[1]: http://www.archlinux.org/pacman/ [1]: http://www.archlinux.org/pacman/
[2]: http://archlinux.fr/yaourt-en [2]: http://archlinux.fr/yaourt-en
[3]: https://github.com/sorin-ionescu/prezto/issues [3]: https://github.com/sorin-ionescu/prezto/issues

View File

@ -20,4 +20,3 @@ find /bin /etc /lib /sbin /usr \
\( -type d -printf '%p/\n' -o -print \) | sort > "$fs" \( -type d -printf '%p/\n' -o -print \) | sort > "$fs"
comm -23 "$fs" "$db" comm -23 "$fs" "$db"

View File

@ -18,4 +18,3 @@ pacman --query --explicit --info \
print $2 print $2
} }
' '

View File

@ -72,7 +72,7 @@ alias pacman-remove-orphans="${_pacman_sudo}${_pacman_frontend} --remove --recur
# Synchronizes the local package and Arch Build System databases against the # Synchronizes the local package and Arch Build System databases against the
# repositories. # repositories.
if (( $+commands[abs] )); then if (( $+commands[abs] )); then
alias pacu="${_pacman_sudo}${_pacman_frontend} --sync --refresh && ${_pacman_sudo}abs" alias pacu="${_pacman_sudo}${_pacman_frontend} --sync --refresh && sudo abs"
else else
alias pacu="${_pacman_sudo}${_pacman_frontend} --sync --refresh" alias pacu="${_pacman_sudo}${_pacman_frontend} --sync --refresh"
fi fi
@ -82,4 +82,3 @@ fi
alias pacU="${_pacman_sudo}${_pacman_frontend} --sync --refresh --sysupgrade" alias pacU="${_pacman_sudo}${_pacman_frontend} --sync --refresh --sysupgrade"
unset _pacman_{frontend,sudo} unset _pacman_{frontend,sudo}

View File

@ -16,4 +16,3 @@ fi
# Manages .pac* files. # Manages .pac* files.
alias pacc='yaourt -C' alias pacc='yaourt -C'

View File

@ -61,4 +61,3 @@ Authors
[1]: http://www.perl.org [1]: http://www.perl.org
[2]: http://perlbrew.pl [2]: http://perlbrew.pl
[3]: https://github.com/sorin-ionescu/prezto/issues [3]: https://github.com/sorin-ionescu/prezto/issues

View File

@ -50,4 +50,3 @@ alias plbO='perlbrew switch-off'
alias plbs='perlbrew switch' alias plbs='perlbrew switch'
alias plbu='perlbrew use' alias plbu='perlbrew use'
alias plbx='perlbrew uninstall' alias plbx='perlbrew uninstall'

View File

@ -109,4 +109,3 @@ Authors
[1]: http://zsh.sourceforge.net/Doc/Release/User-Contributions.html#Prompt-Themes [1]: http://zsh.sourceforge.net/Doc/Release/User-Contributions.html#Prompt-Themes
[2]: http://zsh.sourceforge.net/Doc/Release/Functions.html#Hook-Functions [2]: http://zsh.sourceforge.net/Doc/Release/Functions.html#Hook-Functions
[3]: https://github.com/sorin-ionescu/prezto/issues [3]: https://github.com/sorin-ionescu/prezto/issues

View File

@ -48,4 +48,3 @@ function prompt_minimal_setup {
} }
prompt_minimal_setup "$@" prompt_minimal_setup "$@"

View File

@ -58,4 +58,3 @@ function prompt_nicoulaj_setup {
} }
prompt_nicoulaj_setup "$@" prompt_nicoulaj_setup "$@"

View File

@ -85,4 +85,3 @@ function prompt_peepcode_preview {
} }
prompt_peepcode_setup "$@" prompt_peepcode_setup "$@"

View File

@ -18,7 +18,7 @@ function prompt_sorin_pwd {
_prompt_sorin_pwd="$MATCH" _prompt_sorin_pwd="$MATCH"
unset MATCH unset MATCH
else else
_prompt_sorin_pwd="${${${(@j:/:M)${(@s:/:)pwd}##.#?}:h}%/}/${pwd:t}" _prompt_sorin_pwd="${${${${(@j:/:M)${(@s:/:)pwd}##.#?}:h}%/}//\%/%%}/${${pwd:t}//\%/%%}"
fi fi
} }
@ -78,4 +78,3 @@ function prompt_sorin_setup {
} }
prompt_sorin_setup "$@" prompt_sorin_setup "$@"

View File

@ -92,4 +92,3 @@ ${_prompt_steeef_colors[3]}%n%f at ${_prompt_steeef_colors[2]}%m%f in ${_prompt_
} }
prompt_steeef_setup "$@" prompt_steeef_setup "$@"

View File

@ -16,4 +16,3 @@ else
prompt 'off' prompt 'off'
fi fi
unset prompt_argv unset prompt_argv

View File

@ -97,4 +97,3 @@ Authors
[3]: http://pypi.python.org/pypi/virtualenv [3]: http://pypi.python.org/pypi/virtualenv
[4]: https://github.com/yyuu/pyenv [4]: https://github.com/yyuu/pyenv
[5]: https://github.com/sorin-ionescu/prezto/issues [5]: https://github.com/sorin-ionescu/prezto/issues

View File

@ -19,4 +19,3 @@ if [[ -n "$VIRTUAL_ENV" ]]; then
zformat -f virtualenv_formatted "$virtualenv_format" "v:${VIRTUAL_ENV:t}" zformat -f virtualenv_formatted "$virtualenv_format" "v:${VIRTUAL_ENV:t}"
python_info[virtualenv]="$virtualenv_formatted" python_info[virtualenv]="$virtualenv_formatted"
fi fi

View File

@ -34,15 +34,16 @@ if (( ! $+commands[python] && ! $+commands[pyenv] )); then
return 1 return 1
fi fi
# Load virtualenvwrapper into the shell session. # Load virtualenvwrapper into the shell session, unless requested not to
if (( $+commands[virtualenvwrapper_lazy.sh] )); then zstyle -t ':prezto:module:python' skip-virtualenvwrapper-init
if (( $? && $+commands[virtualenvwrapper.sh] )); then
# Set the directory where virtual environments are stored. # Set the directory where virtual environments are stored.
export WORKON_HOME="$HOME/.virtualenvs" export WORKON_HOME="${WORKON_HOME:-$HOME/.virtualenvs}"
# Disable the virtualenv prompt. # Disable the virtualenv prompt.
VIRTUAL_ENV_DISABLE_PROMPT=1 VIRTUAL_ENV_DISABLE_PROMPT=1
source "$commands[virtualenvwrapper_lazy.sh]" source "$commands[virtualenvwrapper.sh]"
fi fi
# #
@ -50,4 +51,3 @@ fi
# #
alias py='python' alias py='python'

View File

@ -32,4 +32,3 @@ Authors
[1]: http://rubyonrails.org [1]: http://rubyonrails.org
[2]: https://github.com/sorin-ionescu/prezto/issues [2]: https://github.com/sorin-ionescu/prezto/issues

View File

@ -33,4 +33,3 @@ alias rorr='bundle exec rails runner'
alias rors='bundle exec rails server' alias rors='bundle exec rails server'
alias rorsd='bundle exec rails server --debugger' alias rorsd='bundle exec rails server --debugger'
alias rorx='bundle exec rails destroy' alias rorx='bundle exec rails destroy'

View File

@ -25,4 +25,3 @@ Authors
[1]: http://rsync.samba.org [1]: http://rsync.samba.org
[2]: http://help.bombich.com/kb/overview/credits#opensource [2]: http://help.bombich.com/kb/overview/credits#opensource
[3]: https://github.com/sorin-ionescu/prezto/issues [3]: https://github.com/sorin-ionescu/prezto/issues

View File

@ -28,4 +28,3 @@ alias rsync-update="${_rsync_cmd} --update"
alias rsync-synchronize="${_rsync_cmd} --update --delete" alias rsync-synchronize="${_rsync_cmd} --update --delete"
unset _rsync_cmd unset _rsync_cmd

View File

@ -16,4 +16,3 @@ while [[ "$root_dir" != '/' ]]; do
done done
return 1 return 1

View File

@ -28,4 +28,3 @@ if [[ -n "$version" ]]; then
zformat -f version_formatted "$version_format" "v:$version" zformat -f version_formatted "$version_format" "v:$version"
ruby_info[version]="$version_formatted" ruby_info[version]="$version_formatted"
fi fi

View File

@ -63,4 +63,3 @@ if (( $+commands[bundle] )); then
&& print vendor/bundle >>! .gitignore \ && print vendor/bundle >>! .gitignore \
&& print vendor/cache >>! .gitignore' && print vendor/cache >>! .gitignore'
fi fi

View File

@ -38,4 +38,3 @@ Authors
[1]: http://www.gnu.org/software/screen/ [1]: http://www.gnu.org/software/screen/
[2]: https://github.com/sorin-ionescu/prezto/issues [2]: https://github.com/sorin-ionescu/prezto/issues

View File

@ -40,4 +40,3 @@ alias scr='screen'
alias scrl='screen -list' alias scrl='screen -list'
alias scrn='screen -U -S' alias scrn='screen -U -S'
alias scrr='screen -a -A -U -D -R' alias scrr='screen -a -A -U -D -R'

View File

@ -3,7 +3,7 @@ Spectrum
Provides for easier use of 256 colors and effects. 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 Variables
--------- ---------
@ -87,6 +87,5 @@ Authors
- [P.C. Shyamshankar](https://github.com/sykora) - [P.C. Shyamshankar](https://github.com/sykora)
- [Sorin Ionescu](https://github.com/sorin-ionescu) - [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 [2]: https://github.com/sorin-ionescu/prezto/issues

Some files were not shown because too many files have changed in this diff Show More