mirror of
https://github.com/dcarrillo/prezto.git
synced 2025-07-01 20:59:26 +00:00
Compare commits
3 Commits
pull/628-e
...
module/git
| Author | SHA1 | Date | |
|---|---|---|---|
| 729fd07ab0 | |||
| 9d97ee57a3 | |||
| 8de68a9bda |
9
.gitmodules
vendored
9
.gitmodules
vendored
@ -7,12 +7,3 @@
|
||||
[submodule "modules/completion/external"]
|
||||
path = modules/completion/external
|
||||
url = https://github.com/zsh-users/zsh-completions.git
|
||||
[submodule "modules/prompt/external/powerline"]
|
||||
path = modules/prompt/external/powerline
|
||||
url = https://github.com/davidjrice/prezto_powerline.git
|
||||
[submodule "modules/prompt/external/agnoster"]
|
||||
path = modules/prompt/external/agnoster
|
||||
url = https://gist.github.com/3712874.git
|
||||
[submodule "modules/prompt/functions/pure"]
|
||||
path = modules/prompt/external/pure
|
||||
url = https://github.com/sindresorhus/pure.git
|
||||
|
||||
@ -39,3 +39,4 @@ 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
|
||||
[4]: https://help.github.com/articles/using-pull-requests
|
||||
[5]: http://daringfireball.net/projects/markdown/syntax#img
|
||||
|
||||
|
||||
@ -107,10 +107,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
|
||||
[1]: http://www.zsh.org
|
||||
[2]: http://i.imgur.com/AzjmpwM.png "sorin theme"
|
||||
[2]: http://i.imgur.com/nBEEZ.png "sorin theme"
|
||||
[3]: http://git-scm.com
|
||||
[4]: https://github.com
|
||||
[5]: http://gitimmersion.com
|
||||
[6]: http://gitref.org
|
||||
[7]: http://www.bash2zsh.com/zsh_refcard/refcard.pdf
|
||||
[8]: http://grml.org/zsh/zsh-lovers.html
|
||||
|
||||
|
||||
1
init.zsh
1
init.zsh
@ -111,3 +111,4 @@ unset zfunction{s,}
|
||||
zstyle -a ':prezto:load' pmodule 'pmodules'
|
||||
pmodload "$pmodules[@]"
|
||||
unset pmodules
|
||||
|
||||
|
||||
@ -192,3 +192,4 @@ Yum
|
||||
---
|
||||
|
||||
Defines yum aliases.
|
||||
|
||||
|
||||
@ -38,3 +38,4 @@ Authors
|
||||
- [Sorin Ionescu](https://github.com/sorin-ionescu)
|
||||
|
||||
[1]: https://github.com/sorin-ionescu/prezto/issues
|
||||
|
||||
|
||||
@ -11,3 +11,4 @@
|
||||
_arguments \
|
||||
'(-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
|
||||
|
||||
|
||||
@ -11,3 +11,4 @@
|
||||
_arguments \
|
||||
'(-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
|
||||
|
||||
|
||||
@ -30,7 +30,7 @@ while (( $# > 0 )); do
|
||||
continue
|
||||
fi
|
||||
|
||||
case "$1:l" in
|
||||
case "$1" in
|
||||
(*.tar.gz|*.tgz) tar t${verbose:+v}vzf "$1" ;;
|
||||
(*.tar.bz2|*.tbz|*.tbz2) tar t${verbose:+v}jf "$1" ;;
|
||||
(*.tar.xz|*.txz) tar --xz --help &> /dev/null \
|
||||
@ -46,10 +46,11 @@ while (( $# > 0 )); do
|
||||
|| rar ${${verbose:+v}:-l} "$1" ;;
|
||||
(*.7z) 7za l "$1" ;;
|
||||
(*)
|
||||
print "$0: cannot list: $1" >&2
|
||||
print "$0: cannot list: $1" >&2
|
||||
success=1
|
||||
;;
|
||||
esac
|
||||
|
||||
shift
|
||||
done
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@ while (( $# > 0 )); do
|
||||
success=0
|
||||
file_name="${1:t}"
|
||||
extract_dir="${file_name:r}"
|
||||
case "$1:l" in
|
||||
case "$1" in
|
||||
(*.tar.gz|*.tgz) tar xvzf "$1" ;;
|
||||
(*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$1" ;;
|
||||
(*.tar.xz|*.txz) tar --xz --help &> /dev/null \
|
||||
@ -76,3 +76,4 @@ while (( $# > 0 )); do
|
||||
(( $success == 0 )) && (( $remove_archive == 0 )) && rm "$1"
|
||||
shift
|
||||
done
|
||||
|
||||
|
||||
@ -13,3 +13,4 @@ Authors
|
||||
|
||||
[1]: https://code.launchpad.net/command-not-found
|
||||
[2]: https://github.com/sorin-ionescu/prezto/issues
|
||||
|
||||
|
||||
@ -15,3 +15,4 @@ elif [[ -s '/usr/share/doc/pkgfile/command-not-found.zsh' ]]; then
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
|
||||
|
||||
@ -21,3 +21,4 @@ Authors
|
||||
|
||||
[1]: https://github.com/zsh-users/zsh-completions
|
||||
[2]: https://github.com/sorin-ionescu/prezto/issues
|
||||
|
||||
|
||||
@ -146,3 +146,4 @@ 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-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::*'
|
||||
|
||||
|
||||
@ -33,3 +33,4 @@ Authors
|
||||
- [Sorin Ionescu](https://github.com/sorin-ionescu)
|
||||
|
||||
[1]: https://github.com/sorin-ionescu/prezto/issues
|
||||
|
||||
|
||||
@ -28,3 +28,4 @@ unsetopt CLOBBER # Do not overwrite existing files with > and >>.
|
||||
|
||||
alias d='dirs -v'
|
||||
for index ({1..9}) alias "$index"="cd +${index}"; unset index
|
||||
|
||||
|
||||
@ -39,3 +39,4 @@ Authors
|
||||
|
||||
[1]: http://wiki.debian.org/Teams/Dpkg
|
||||
[2]: https://github.com/sorin-ionescu/prezto/issues
|
||||
|
||||
|
||||
@ -23,3 +23,4 @@ rm "$clone_script"
|
||||
print '#!/bin/sh\n' > "$clone_script"
|
||||
print "aptitude install ${package_list}\n" >> "$clone_script"
|
||||
chmod +x "$clone_script"
|
||||
|
||||
|
||||
@ -34,3 +34,4 @@ Commands:
|
||||
EOF
|
||||
;;
|
||||
esac
|
||||
|
||||
|
||||
@ -12,3 +12,4 @@ MAKEFLAGS='' time fakeroot make-kpkg \
|
||||
--revision "$(date +"%Y%m%d")" \
|
||||
kernel_image \
|
||||
kernel_headers
|
||||
|
||||
|
||||
@ -55,3 +55,4 @@ alias deb-build='time dpkg-buildpackage -rfakeroot -us -uc'
|
||||
|
||||
# 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`))"'
|
||||
|
||||
|
||||
@ -59,3 +59,4 @@ Authors
|
||||
- [Sorin Ionescu](https://github.com/sorin-ionescu)
|
||||
|
||||
[1]: https://github.com/sorin-ionescu/oh-my-zsh/issues
|
||||
|
||||
|
||||
@ -28,35 +28,33 @@ WORDCHARS='*?_-.[]~&;!#$%^(){}<>'
|
||||
zmodload zsh/terminfo
|
||||
typeset -gA key_info
|
||||
key_info=(
|
||||
'Control' '\C-'
|
||||
'ControlLeft' '\e[1;5D \e[5D \e\e[D \eOd'
|
||||
'ControlRight' '\e[1;5C \e[5C \e\e[C \eOc'
|
||||
'Escape' '\e'
|
||||
'Meta' '\M-'
|
||||
'Backspace' "^?"
|
||||
'Delete' "^[[3~"
|
||||
'F1' "$terminfo[kf1]"
|
||||
'F2' "$terminfo[kf2]"
|
||||
'F3' "$terminfo[kf3]"
|
||||
'F4' "$terminfo[kf4]"
|
||||
'F5' "$terminfo[kf5]"
|
||||
'F6' "$terminfo[kf6]"
|
||||
'F7' "$terminfo[kf7]"
|
||||
'F8' "$terminfo[kf8]"
|
||||
'F9' "$terminfo[kf9]"
|
||||
'F10' "$terminfo[kf10]"
|
||||
'F11' "$terminfo[kf11]"
|
||||
'F12' "$terminfo[kf12]"
|
||||
'Insert' "$terminfo[kich1]"
|
||||
'Home' "$terminfo[khome]"
|
||||
'PageUp' "$terminfo[kpp]"
|
||||
'End' "$terminfo[kend]"
|
||||
'PageDown' "$terminfo[knp]"
|
||||
'Up' "$terminfo[kcuu1]"
|
||||
'Left' "$terminfo[kcub1]"
|
||||
'Down' "$terminfo[kcud1]"
|
||||
'Right' "$terminfo[kcuf1]"
|
||||
'BackTab' "$terminfo[kcbt]"
|
||||
'Control' '\C-'
|
||||
'Escape' '\e'
|
||||
'Meta' '\M-'
|
||||
'Backspace' "^?"
|
||||
'Delete' "^[[3~"
|
||||
'F1' "$terminfo[kf1]"
|
||||
'F2' "$terminfo[kf2]"
|
||||
'F3' "$terminfo[kf3]"
|
||||
'F4' "$terminfo[kf4]"
|
||||
'F5' "$terminfo[kf5]"
|
||||
'F6' "$terminfo[kf6]"
|
||||
'F7' "$terminfo[kf7]"
|
||||
'F8' "$terminfo[kf8]"
|
||||
'F9' "$terminfo[kf9]"
|
||||
'F10' "$terminfo[kf10]"
|
||||
'F11' "$terminfo[kf11]"
|
||||
'F12' "$terminfo[kf12]"
|
||||
'Insert' "$terminfo[kich1]"
|
||||
'Home' "$terminfo[khome]"
|
||||
'PageUp' "$terminfo[kpp]"
|
||||
'End' "$terminfo[kend]"
|
||||
'PageDown' "$terminfo[knp]"
|
||||
'Up' "$terminfo[kcuu1]"
|
||||
'Left' "$terminfo[kcub1]"
|
||||
'Down' "$terminfo[kcud1]"
|
||||
'Right' "$terminfo[kcuf1]"
|
||||
'BackTab' "$terminfo[kcbt]"
|
||||
)
|
||||
|
||||
# Set empty $key_info values to an invalid UTF-8 sequence to induce silent
|
||||
@ -208,10 +206,10 @@ bindkey -d
|
||||
# Emacs Key Bindings
|
||||
#
|
||||
|
||||
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
|
||||
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
|
||||
|
||||
# Kill to the beginning of the line.
|
||||
for key in "$key_info[Escape]"{K,k}
|
||||
@ -327,3 +325,4 @@ else
|
||||
fi
|
||||
|
||||
unset key{,map,bindings}
|
||||
|
||||
|
||||
@ -23,3 +23,4 @@ Authors
|
||||
- [Sorin Ionescu](https://github.com/sorin-ionescu)
|
||||
|
||||
[1]: https://github.com/sorin-ionescu/prezto/issues
|
||||
|
||||
|
||||
@ -55,3 +55,4 @@ if zstyle -t ':prezto:environment:termcap' color; then
|
||||
export LESS_TERMCAP_ue=$'\E[0m' # Ends underline.
|
||||
export LESS_TERMCAP_us=$'\E[01;32m' # Begins underline.
|
||||
fi
|
||||
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
#Explainshell
|
||||
|
||||
Adds a keybinding and a function to open
|
||||
[explainshell.com](http://www.explainshell.com) with the content of the command
|
||||
line.
|
||||
|
||||
##Settings
|
||||
###Key-Binding
|
||||
The keybinding to open [explainshell.com](http://www.explainshell.com)
|
||||
|
||||
`zstyle ':prezto:module:explainshell' key-binding '^K'`
|
||||
@ -1,63 +0,0 @@
|
||||
#
|
||||
# Adds a explain function and explainshell widget
|
||||
#
|
||||
# Authors
|
||||
# C Lentfort
|
||||
#
|
||||
|
||||
function _expand_alias_recursive {
|
||||
local _alias
|
||||
for word in "$@"; do
|
||||
# Check if word is aliased
|
||||
_alias=$aliases[$word]
|
||||
if [ -n "$_alias" ]; then
|
||||
# Check if found alias and given command are identical
|
||||
if [[ "$_alias" != "${(j: :)@}" ]]; then
|
||||
_expand_alias_recursive "${(z)_alias}"
|
||||
else
|
||||
_explainshell_expanded_buffer+=$1
|
||||
fi
|
||||
else
|
||||
_explainshell_expanded_buffer+=$word
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
function explain {
|
||||
local url
|
||||
# We don't explain empty buffers
|
||||
if (( $# == 0 )); then
|
||||
return 1;
|
||||
fi
|
||||
|
||||
# Replace aliases with their actual expansions
|
||||
_explainshell_expanded_buffer=()
|
||||
_expand_alias_recursive $@
|
||||
_explainshell_expanded_buffer=(${(u)_explainshell_expanded_buffer})
|
||||
# base url with first command already injected
|
||||
# $ explain tar
|
||||
# => http://explainshel.com/explain/tar?args=
|
||||
url="http://explainshell.com/explain?cmd="
|
||||
|
||||
# iterates over remaining args and adds builds the rest of the url
|
||||
for i in "$_explainshell_expanded_buffer"; do
|
||||
url=$url"$i""+"
|
||||
done
|
||||
|
||||
unset _explainshell_expanded_buffer
|
||||
# opens url in browser
|
||||
$BROWSER -t $url &> /dev/null
|
||||
}
|
||||
|
||||
function explainshell {
|
||||
explain ${(z)BUFFER}
|
||||
}
|
||||
|
||||
zle -N explainshell
|
||||
|
||||
zstyle -s ':prezto:module:explainshell' key-binding 'key_binding'
|
||||
if [[ -n "$key_binding" ]]; then
|
||||
bindkey "$key_binding" explainshell
|
||||
fi
|
||||
|
||||
unset key_binding
|
||||
@ -36,3 +36,4 @@ Authors
|
||||
[3]: https://github.com/rupa/z
|
||||
[4]: https://github.com/rupa/v
|
||||
[5]: https://github.com/sorin-ionescu/prezto/issues
|
||||
|
||||
|
||||
@ -51,3 +51,4 @@ function fasd_cd {
|
||||
|
||||
# Changes the current working directory interactively.
|
||||
alias j='fasd_cd -i'
|
||||
|
||||
|
||||
@ -332,3 +332,4 @@ Authors
|
||||
[6]: https://github.com/sorin-ionescu/prezto/issues
|
||||
[7]: https://github.com/sorin-ionescu/prezto/issues/219
|
||||
[8]: http://www.kernel.org/pub/software/scm/git/docs/git-log.html
|
||||
|
||||
|
||||
@ -100,12 +100,12 @@ alias gix='git rm -r --cached'
|
||||
alias giX='git rm -rf --cached'
|
||||
|
||||
# Log (l)
|
||||
alias gl='git log --topo-order --pretty=format:"${_git_log_medium_format}"'
|
||||
alias gls='git log --topo-order --stat --pretty=format:"${_git_log_medium_format}"'
|
||||
alias gld='git log --topo-order --stat --patch --full-diff --pretty=format:"${_git_log_medium_format}"'
|
||||
alias glo='git log --topo-order --pretty=format:"${_git_log_oneline_format}"'
|
||||
alias glg='git log --topo-order --all --graph --pretty=format:"${_git_log_oneline_format}"'
|
||||
alias glb='git log --topo-order --pretty=format:"${_git_log_brief_format}"'
|
||||
alias gl='git log --topo-order --pretty=format:${_git_log_medium_format}'
|
||||
alias gls='git log --topo-order --stat --pretty=format:${_git_log_medium_format}'
|
||||
alias gld='git log --topo-order --stat --patch --full-diff --pretty=format:${_git_log_medium_format}'
|
||||
alias glo='git log --topo-order --pretty=format:${_git_log_oneline_format}'
|
||||
alias glg='git log --topo-order --all --graph --pretty=format:${_git_log_oneline_format}'
|
||||
alias glb='git log --topo-order --pretty=format:${_git_log_brief_format}'
|
||||
alias glc='git shortlog --summary --numbered'
|
||||
|
||||
# Merge (m)
|
||||
@ -179,3 +179,4 @@ alias gwc='git clean -n'
|
||||
alias gwC='git clean -f'
|
||||
alias gwx='git rm -r'
|
||||
alias gwX='git rm -rf'
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||
#
|
||||
|
||||
if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||
if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
@ -21,7 +21,7 @@ _arguments -C -s -S \
|
||||
|
||||
case "$state" in
|
||||
(remote)
|
||||
remotes=($(git config --get-regexp 'remote.*.url' | cut -d. -f2))
|
||||
remotes=($(command git config --get-regexp 'remote.*.url' | cut -d. -f2))
|
||||
|
||||
_describe -t branch 'remotes' remotes && ret=0
|
||||
;;
|
||||
@ -29,7 +29,7 @@ case "$state" in
|
||||
remote="$words[(($CURRENT - 1))]"
|
||||
|
||||
branches_or_tags=($(
|
||||
git ls-remote --heads --tags "$remote" 2>/dev/null | cut -f2
|
||||
command git ls-remote --heads --tags "$remote" 2>/dev/null | cut -f2
|
||||
))
|
||||
|
||||
branches=(HEAD ${${(M)branches_or_tags[@]##refs/heads/?##}##refs/heads/})
|
||||
@ -39,9 +39,10 @@ case "$state" in
|
||||
_describe -t tag 'tags' tags && ret=0
|
||||
;;
|
||||
(file)
|
||||
files=(${(0)"$(_call_program files git ls-files -z --exclude-standard 2>/dev/null)"})
|
||||
files=(${(0)"$(_call_program files command git ls-files -z --exclude-standard 2>/dev/null)"})
|
||||
_wanted file expl 'file' _multi_parts - / files && ret=0
|
||||
;;
|
||||
esac
|
||||
|
||||
return $ret
|
||||
|
||||
|
||||
@ -9,3 +9,4 @@
|
||||
#
|
||||
|
||||
_arguments '1:url:' && return 0
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||
#
|
||||
|
||||
if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||
if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
@ -16,3 +16,4 @@ _arguments "1:toggle:((
|
||||
on\:'enable in-prompt information for the current repository'
|
||||
off\:'disable in-prompt information for the current repository'
|
||||
))" && return 0
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||
#
|
||||
|
||||
if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||
if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
@ -25,7 +25,7 @@ case "$state" in
|
||||
while IFS=$'\n' read submodule; do
|
||||
submodules+=("$submodule")
|
||||
done < <(
|
||||
git config --file "$(git-root)/.gitmodules" --list \
|
||||
command git config --file "$(git-root)/.gitmodules" --list \
|
||||
| grep '.path=' \
|
||||
| cut -d= -f2-
|
||||
)
|
||||
@ -38,3 +38,4 @@ case "$state" in
|
||||
esac
|
||||
|
||||
return $ret
|
||||
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||
#
|
||||
|
||||
if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||
if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
@ -18,9 +18,10 @@ local submodule
|
||||
while IFS=$'\n' read submodule; do
|
||||
submodules+=("$submodule")
|
||||
done < <(
|
||||
git config --file "$(git-root)/.gitmodules" --list \
|
||||
command git config --file "$(git-root)/.gitmodules" --list \
|
||||
| grep '.path=' \
|
||||
| cut -d= -f2-
|
||||
)
|
||||
|
||||
_describe -t submodule 'submodules' submodules && return 0
|
||||
|
||||
|
||||
@ -5,12 +5,12 @@
|
||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||
#
|
||||
|
||||
if ! git rev-parse 2> /dev/null; then
|
||||
if ! command git rev-parse 2> /dev/null; then
|
||||
print "$0: not a repository: $PWD" >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
local ref="$(git symbolic-ref HEAD 2> /dev/null)"
|
||||
local ref="$(command git symbolic-ref HEAD 2> /dev/null)"
|
||||
|
||||
if [[ -n "$ref" ]]; then
|
||||
print "${ref#refs/heads/}"
|
||||
@ -18,3 +18,4 @@ if [[ -n "$ref" ]]; then
|
||||
else
|
||||
return 1
|
||||
fi
|
||||
|
||||
|
||||
@ -5,16 +5,17 @@
|
||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||
#
|
||||
|
||||
if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||
if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||
print "$0: not a repository work tree: $PWD" >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
git fsck 2> /dev/null \
|
||||
command git fsck 2> /dev/null \
|
||||
| grep "^dangling commit" \
|
||||
| awk '{print $3}' \
|
||||
| git log \
|
||||
| command git log \
|
||||
--date-order \
|
||||
--no-walk \
|
||||
--stdin \
|
||||
--pretty=format:${_git_log_oneline_format}
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||
#
|
||||
|
||||
local git_dir="${$(git rev-parse --git-dir):A}"
|
||||
local git_dir="${$(command git rev-parse --git-dir):A}"
|
||||
|
||||
if [[ -n "$git_dir" ]]; then
|
||||
print "$git_dir"
|
||||
@ -14,3 +14,4 @@ else
|
||||
print "$0: not a repository: $PWD" >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||
#
|
||||
|
||||
if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||
if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||
print "$0: not a repository work tree: $PWD" >&2
|
||||
return 1
|
||||
fi
|
||||
@ -13,7 +13,7 @@ fi
|
||||
local remotes remote references reference file url
|
||||
|
||||
remote="${1:-origin}"
|
||||
remotes=($(git config --get-regexp 'remote.*.url' | cut -d. -f2))
|
||||
remotes=($(command git config --get-regexp 'remote.*.url' | cut -d. -f2))
|
||||
|
||||
if (( $remotes[(i)$remote] == $#remotes + 1 )); then
|
||||
print "$0: remote not found: $remote" >&2
|
||||
@ -21,14 +21,14 @@ if (( $remotes[(i)$remote] == $#remotes + 1 )); then
|
||||
fi
|
||||
|
||||
url=$(
|
||||
git config --get "remote.${remote}.url" \
|
||||
command git config --get "remote.${remote}.url" \
|
||||
| sed -En "s/(git|https?)(@|:\/\/)github.com(:|\/)(.+)\/(.+).git/https:\/\/github.com\/\4\/\5/p"
|
||||
)
|
||||
|
||||
reference="${${2:-$(git-branch-current)}:-HEAD}"
|
||||
references=(
|
||||
HEAD
|
||||
${$(git ls-remote --heads --tags "$remote" | awk '{print $2}')##refs/(heads|tags)/}
|
||||
${$(command git ls-remote --heads --tags "$remote" | awk '{print $2}')##refs/(heads|tags)/}
|
||||
)
|
||||
|
||||
if (( $references[(i)$reference] == $#references + 1 )); then
|
||||
@ -37,7 +37,7 @@ if (( $references[(i)$reference] == $#references + 1 )); then
|
||||
fi
|
||||
|
||||
if [[ "$reference" == 'HEAD' ]]; then
|
||||
reference="$(git rev-parse HEAD 2>/dev/null)"
|
||||
reference="$(command git rev-parse HEAD 2>/dev/null)"
|
||||
fi
|
||||
|
||||
file="$3"
|
||||
@ -56,3 +56,4 @@ else
|
||||
print "$0: not a Git repository or remote not set" >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
|
||||
@ -20,3 +20,4 @@ if (( $+commands[curl] )); then
|
||||
else
|
||||
print "$0: command not found: curl" >&2
|
||||
fi
|
||||
|
||||
|
||||
@ -164,15 +164,15 @@ function git-info {
|
||||
typeset -gA git_info
|
||||
|
||||
# Return if not inside a Git repository work tree.
|
||||
if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||
if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
if (( $# > 0 )); then
|
||||
if [[ "$1" == [Oo][Nn] ]]; then
|
||||
git config --bool prompt.showinfo true
|
||||
command git config --bool prompt.showinfo true
|
||||
elif [[ "$1" == [Oo][Ff][Ff] ]]; then
|
||||
git config --bool prompt.showinfo false
|
||||
command git config --bool prompt.showinfo false
|
||||
else
|
||||
print "usage: $0 [ on | off ]" >&2
|
||||
fi
|
||||
@ -180,7 +180,7 @@ function git-info {
|
||||
fi
|
||||
|
||||
# Return if git-info is disabled.
|
||||
if ! is-true "${$(git config --bool prompt.showinfo):-true}"; then
|
||||
if ! is-true "${$(command git config --bool prompt.showinfo):-true}"; then
|
||||
return 1
|
||||
fi
|
||||
|
||||
@ -190,7 +190,7 @@ function git-info {
|
||||
# Format commit.
|
||||
zstyle -s ':prezto:module:git:info:commit' format 'commit_format'
|
||||
if [[ -n "$commit_format" ]]; then
|
||||
commit="$(git rev-parse HEAD 2> /dev/null)"
|
||||
commit="$(command git rev-parse HEAD 2> /dev/null)"
|
||||
if [[ -n "$commit" ]]; then
|
||||
zformat -f commit_formatted "$commit_format" "c:$commit"
|
||||
fi
|
||||
@ -199,7 +199,7 @@ function git-info {
|
||||
# Format stashed.
|
||||
zstyle -s ':prezto:module:git:info:stashed' format 'stashed_format'
|
||||
if [[ -n "$stashed_format" && -f "$(git-dir)/refs/stash" ]]; then
|
||||
stashed="$(git stash list 2> /dev/null | wc -l | awk '{print $1}')"
|
||||
stashed="$(command git stash list 2> /dev/null | wc -l | awk '{print $1}')"
|
||||
if [[ -n "$stashed" ]]; then
|
||||
zformat -f stashed_formatted "$stashed_format" "S:$stashed"
|
||||
fi
|
||||
@ -215,7 +215,7 @@ function git-info {
|
||||
fi
|
||||
|
||||
# Get the branch.
|
||||
branch="${$(git symbolic-ref HEAD 2> /dev/null)#refs/heads/}"
|
||||
branch="${$(command git symbolic-ref HEAD 2> /dev/null)#refs/heads/}"
|
||||
|
||||
# Format branch.
|
||||
zstyle -s ':prezto:module:git:info:branch' format 'branch_format'
|
||||
@ -226,7 +226,7 @@ function git-info {
|
||||
# Format position.
|
||||
zstyle -s ':prezto:module:git:info:position' format 'position_format'
|
||||
if [[ -z "$branch" && -n "$position_format" ]]; then
|
||||
position="$(git describe --contains --all HEAD 2> /dev/null)"
|
||||
position="$(command git describe --contains --all HEAD 2> /dev/null)"
|
||||
if [[ -n "$position" ]]; then
|
||||
zformat -f position_formatted "$position_format" "p:$position"
|
||||
fi
|
||||
@ -236,7 +236,7 @@ function git-info {
|
||||
zstyle -s ':prezto:module:git:info:remote' format 'remote_format'
|
||||
if [[ -n "$branch" && -n "$remote_format" ]]; then
|
||||
# Gets the remote name.
|
||||
remote_cmd='git rev-parse --symbolic-full-name --verify HEAD@{upstream}'
|
||||
remote_cmd='command git rev-parse --symbolic-full-name --verify HEAD@{upstream}'
|
||||
remote="${$(${(z)remote_cmd} 2> /dev/null)##refs/remotes/}"
|
||||
if [[ -n "$remote" ]]; then
|
||||
zformat -f remote_formatted "$remote_format" "R:$remote"
|
||||
@ -247,7 +247,7 @@ function git-info {
|
||||
zstyle -s ':prezto:module:git:info:behind' format 'behind_format'
|
||||
if [[ -n "$branch" && ( -n "$ahead_format" || -n "$behind_format" ) ]]; then
|
||||
# Gets the commit difference counts between local and remote.
|
||||
ahead_and_behind_cmd='git rev-list --count --left-right HEAD...@{upstream}'
|
||||
ahead_and_behind_cmd='command git rev-list --count --left-right HEAD...@{upstream}'
|
||||
|
||||
# Get ahead and behind counts.
|
||||
ahead_and_behind="$(${(z)ahead_and_behind_cmd} 2> /dev/null)"
|
||||
@ -276,7 +276,7 @@ function git-info {
|
||||
if [[ -n "$indexed_format" ]]; then
|
||||
((
|
||||
indexed+=$(
|
||||
git diff-index \
|
||||
command git diff-index \
|
||||
--no-ext-diff \
|
||||
--name-only \
|
||||
--cached \
|
||||
@ -296,7 +296,7 @@ function git-info {
|
||||
if [[ -n "$unindexed_format" ]]; then
|
||||
((
|
||||
unindexed+=$(
|
||||
git diff-files \
|
||||
command git diff-files \
|
||||
--no-ext-diff \
|
||||
--name-only \
|
||||
--ignore-submodules=${ignore_submodules:-none} \
|
||||
@ -314,7 +314,7 @@ function git-info {
|
||||
if [[ -n "$untracked_format" ]]; then
|
||||
((
|
||||
untracked+=$(
|
||||
git ls-files \
|
||||
command git ls-files \
|
||||
--other \
|
||||
--exclude-standard \
|
||||
2> /dev/null \
|
||||
@ -329,7 +329,7 @@ function git-info {
|
||||
(( dirty = indexed + unindexed + untracked ))
|
||||
else
|
||||
# Use porcelain status for easy parsing.
|
||||
status_cmd="git status --porcelain --ignore-submodules=${ignore_submodules:-none}"
|
||||
status_cmd="command git status --porcelain --ignore-submodules=${ignore_submodules:-none}"
|
||||
|
||||
# Get current status.
|
||||
while IFS=$'\n' read line; do
|
||||
@ -421,3 +421,4 @@ function git-info {
|
||||
}
|
||||
|
||||
git-info "$@"
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||
#
|
||||
|
||||
local root="$(git rev-parse --show-toplevel 2> /dev/null)"
|
||||
local root="$(command git rev-parse --show-toplevel 2> /dev/null)"
|
||||
|
||||
if [[ -n "$root" ]]; then
|
||||
print "$root"
|
||||
@ -14,3 +14,4 @@ else
|
||||
print "$0: not a repository work tree: $PWD" >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||
#
|
||||
|
||||
if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||
if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||
print "$0: not a repository work tree: $PWD" >&2
|
||||
return 1
|
||||
fi
|
||||
@ -13,10 +13,11 @@ fi
|
||||
local stashed
|
||||
|
||||
if [[ -f "$(git-dir)/refs/stash" ]]; then
|
||||
stashed="$(git stash list 2> /dev/null | wc -l | awk '{print $1}')"
|
||||
stashed="$(command git stash list 2> /dev/null | wc -l | awk '{print $1}')"
|
||||
if (( $stashed > 0 )); then
|
||||
if read -q "?Clear $stashed stashed state(s) [y/N]? "; then
|
||||
git stash clear
|
||||
command git stash clear
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@ -5,18 +5,19 @@
|
||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||
#
|
||||
|
||||
if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||
if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||
print "$0: not a repository work tree: $PWD" >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
git fsck --unreachable 2> /dev/null \
|
||||
command git fsck --unreachable 2> /dev/null \
|
||||
| grep 'commit' \
|
||||
| awk '{print $3}' \
|
||||
| git log \
|
||||
| command git log \
|
||||
--pretty=format:${_git_log_oneline_format} \
|
||||
--extended-regexp \
|
||||
--grep="${1:-(WIP )?[Oo]n [^:]+:}" \
|
||||
--merges \
|
||||
--no-walk \
|
||||
--stdin
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||
#
|
||||
|
||||
if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||
if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||
print "$0: not a repository work tree: $PWD" >&2
|
||||
return 1
|
||||
fi
|
||||
@ -13,6 +13,7 @@ fi
|
||||
local commit
|
||||
|
||||
for commit in "$@"; do
|
||||
git update-ref \
|
||||
-m "$(git log -1 --pretty="format:%s" "$commit")" refs/stash "$commit"
|
||||
command git update-ref \
|
||||
-m "$(command git log -1 --pretty="format:%s" "$commit")" refs/stash "$commit"
|
||||
done
|
||||
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||
#
|
||||
|
||||
if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||
if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||
print "$0: not a repository work tree: $PWD" >&2
|
||||
return 1
|
||||
elif [[ "$PWD" != "$(git-root)" ]]; then
|
||||
@ -17,7 +17,7 @@ local src="$1"
|
||||
local dst="$2"
|
||||
local url
|
||||
|
||||
url="$(git config --file "$(git-root)/.gitmodules" --get "submodule.${src}.url")"
|
||||
url="$(command git config --file "$(git-root)/.gitmodules" --get "submodule.${src}.url")"
|
||||
|
||||
if [[ -z "$url" ]]; then
|
||||
print "$0: submodule not found: $src" >&2
|
||||
@ -27,6 +27,7 @@ fi
|
||||
mkdir -p "${dst:h}"
|
||||
|
||||
git-submodule-remove "$src"
|
||||
git submodule add "$url" "$dst"
|
||||
command git submodule add "$url" "$dst"
|
||||
|
||||
return 0
|
||||
|
||||
|
||||
@ -5,23 +5,24 @@
|
||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||
#
|
||||
|
||||
if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||
if ! is-true "$(command git rev-parse --is-inside-work-tree 2> /dev/null)"; then
|
||||
print "$0: not a repository work tree: $PWD" >&2
|
||||
return 1
|
||||
elif [[ "$PWD" != "$(git-root)" ]]; then
|
||||
print "$0: must be run from the root of the work tree" >&2
|
||||
return 1
|
||||
elif ! git config --file .gitmodules --get "submodule.${1}.path" &>/dev/null; then
|
||||
elif ! command git config --file .gitmodules --get "submodule.${1}.path" &>/dev/null; then
|
||||
print "$0: submodule not found: $1" >&2
|
||||
return 1
|
||||
fi
|
||||
|
||||
git config --file "$(git-dir)/config" --remove-section "submodule.${1}" &>/dev/null
|
||||
git config --file "$(git-root)/.gitmodules" --remove-section "submodule.${1}" &>/dev/null
|
||||
git add .gitmodules
|
||||
command git config --file "$(git-dir)/config" --remove-section "submodule.${1}" &>/dev/null
|
||||
command git config --file "$(git-root)/.gitmodules" --remove-section "submodule.${1}" &>/dev/null
|
||||
command git add .gitmodules
|
||||
|
||||
git rm --cached -rf "${1}"
|
||||
command git rm --cached -rf "${1}"
|
||||
rm -rf "${1}"
|
||||
rm -rf "$(git-dir)/modules/${1}"
|
||||
|
||||
return 0
|
||||
|
||||
|
||||
15
modules/git/hub.zsh
Normal file
15
modules/git/hub.zsh
Normal file
@ -0,0 +1,15 @@
|
||||
#
|
||||
# Adds GitHub knowledge to the Git command.
|
||||
# https://hub.github.com
|
||||
#
|
||||
# Authors:
|
||||
# Chris Wanstrath <chris@wanstrath.com>
|
||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||
#
|
||||
|
||||
if (( $+commands[hub] )); then
|
||||
function git {
|
||||
hub "$@"
|
||||
}
|
||||
fi
|
||||
|
||||
@ -15,3 +15,5 @@ pmodload 'helper'
|
||||
|
||||
# Source module files.
|
||||
source "${0:h}/alias.zsh"
|
||||
source "${0:h}/hub.zsh"
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
GNU Utility
|
||||
===========
|
||||
|
||||
Provides for the interactive use of GNU utilities on BSD systems.
|
||||
Provides for the interactive use of GNU utilities on non-GNU systems.
|
||||
|
||||
Installing GNU utilities on non-GNU systems in `$PATH` without a prefix, i.e.
|
||||
`ls` instead of `gls`, is not recommended since scripts that target other
|
||||
@ -30,3 +30,4 @@ Authors
|
||||
- [Sorin Ionescu](https://github.com/sorin-ionescu)
|
||||
|
||||
[1]: https://github.com/sorin-ionescu/prezto/issues
|
||||
|
||||
|
||||
@ -58,3 +58,4 @@ for _gnu_utility_cmd in "${_gnu_utility_cmds[@]}"; do
|
||||
done
|
||||
|
||||
unset _gnu_utility_{p,cmds,cmd,pcmd}
|
||||
|
||||
|
||||
@ -24,3 +24,4 @@ Authors
|
||||
[1]: http://www.gnupg.org
|
||||
[2]: http://linux.die.net/man/1/gpg-agent
|
||||
[3]: https://github.com/sorin-ionescu/prezto/issues
|
||||
|
||||
|
||||
@ -44,3 +44,4 @@ unset _gpg_agent_{conf,env}
|
||||
if [[ -n "$SSH_CONNECTION" ]]; then
|
||||
export PINENTRY_USER_DATA='USE_CURSES=1'
|
||||
fi
|
||||
|
||||
|
||||
@ -26,3 +26,4 @@ Authors
|
||||
|
||||
[1]: http://www.haskell.org/cabal/
|
||||
[2]: https://github.com/sorin-ionescu/prezto/issues
|
||||
|
||||
|
||||
@ -22,3 +22,4 @@ Authors
|
||||
- [Sorin Ionescu](https://github.com/sorin-ionescu)
|
||||
|
||||
[1]: https://github.com/sorin-ionescu/prezto/issues
|
||||
|
||||
|
||||
@ -39,3 +39,4 @@ function add-zsh-trap {
|
||||
}
|
||||
|
||||
add-zsh-trap "$@"
|
||||
|
||||
|
||||
@ -29,3 +29,4 @@ function coalesce {
|
||||
done
|
||||
return 1
|
||||
}
|
||||
|
||||
|
||||
@ -59,3 +59,4 @@ Authors
|
||||
[1]: https://github.com/zsh-users/zsh-history-substring-search
|
||||
[2]: http://fishshell.com
|
||||
[3]: https://github.com/sorin-ionescu/prezto/issues
|
||||
|
||||
|
||||
@ -55,3 +55,4 @@ if [[ -n "$key_info" ]]; then
|
||||
bindkey -M "$keymap" "$key_info[Down]" history-substring-search-down
|
||||
done
|
||||
fi
|
||||
|
||||
|
||||
@ -41,3 +41,4 @@ Authors
|
||||
|
||||
[1]: http://zsh.sourceforge.net/Guide/zshguide02.html#l16
|
||||
[2]: https://github.com/sorin-ionescu/prezto/issues
|
||||
|
||||
|
||||
@ -6,8 +6,6 @@ Defines Homebrew aliases.
|
||||
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.
|
||||
@ -17,22 +15,12 @@ Aliases
|
||||
- `brewu` upgrades Homebrew.
|
||||
- `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
|
||||
-------
|
||||
|
||||
*The authors of this module should be contacted via the [issue tracker][1].*
|
||||
|
||||
- [Sorin Ionescu](https://github.com/sorin-ionescu)
|
||||
- [Griffin Yourick](https://github.com/tough-griff)
|
||||
|
||||
[1]: https://github.com/sorin-ionescu/prezto/issues
|
||||
|
||||
|
||||
@ -14,7 +14,6 @@ fi
|
||||
# Aliases
|
||||
#
|
||||
|
||||
# Homebrew
|
||||
alias brewc='brew cleanup'
|
||||
alias brewC='brew cleanup --force'
|
||||
alias brewi='brew install'
|
||||
@ -24,11 +23,3 @@ alias brewu='brew upgrade'
|
||||
alias brewU='brew update && brew upgrade'
|
||||
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'
|
||||
|
||||
@ -23,3 +23,4 @@ Authors
|
||||
- [Sorin Ionescu](https://github.com/sorin-ionescu)
|
||||
|
||||
[1]: https://github.com/sorin-ionescu/prezto/issues
|
||||
|
||||
|
||||
@ -32,3 +32,4 @@ alias portU='sudo port selfupdate && sudo port upgrade outdated'
|
||||
alias portu='sudo port upgrade'
|
||||
alias portX='sudo port -u uninstall'
|
||||
alias portx='sudo port uninstall'
|
||||
|
||||
|
||||
@ -43,3 +43,4 @@ Authors
|
||||
[3]: http://nodejs.org/api
|
||||
[4]: https://github.com/sorin-ionescu/prezto/issues
|
||||
[5]: https://github.com/creationix/nvm
|
||||
|
||||
|
||||
@ -12,3 +12,4 @@ fi
|
||||
|
||||
# TODO: Make the sections easier to use.
|
||||
"$BROWSER" "http://nodejs.org/docs/$(node --version | sed 's/-.*//')/api/all.html#${1}"
|
||||
|
||||
|
||||
@ -17,8 +17,9 @@ if (( $+functions[nvm_version] )); then
|
||||
version="${$(nvm_version)#v}"
|
||||
fi
|
||||
|
||||
if [[ "$version" != (none|) ]]; 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"
|
||||
fi
|
||||
|
||||
|
||||
@ -6,13 +6,9 @@
|
||||
# Zeh Rizzatti <zehrizzatti@gmail.com>
|
||||
#
|
||||
|
||||
# Load manually installed NVM into the shell session.
|
||||
# Load NVM into the shell session.
|
||||
if [[ -s "$HOME/.nvm/nvm.sh" ]]; then
|
||||
source "$HOME/.nvm/nvm.sh"
|
||||
|
||||
# Load package manager installed NVM into the shell session.
|
||||
elif (( $+commands[brew] )) && [[ -d "$(brew --prefix nvm 2>/dev/null)" ]]; then
|
||||
source $(brew --prefix nvm)/nvm.sh
|
||||
fi
|
||||
|
||||
# Return if requirements are not found.
|
||||
@ -33,3 +29,4 @@ if (( $+commands[npm] )); then
|
||||
|
||||
unset cache_file
|
||||
fi
|
||||
|
||||
|
||||
@ -25,3 +25,4 @@ Authors
|
||||
[1]: http://ocaml.org/
|
||||
[2]: http://opam.ocamlpro.com/
|
||||
[3]: https://github.com/sorin-ionescu/prezto/issues
|
||||
|
||||
|
||||
@ -6,9 +6,10 @@
|
||||
#
|
||||
|
||||
# Return if requirements are not found.
|
||||
if [[ ! -f "$HOME/.opam/opam-init/init.zsh" ]]; then
|
||||
if (( ! $+commands[opam] )); then
|
||||
return 1
|
||||
fi
|
||||
|
||||
# Initialize OPAM.
|
||||
source "$HOME/.opam/opam-init/init.zsh"
|
||||
eval "$(opam config env)"
|
||||
|
||||
|
||||
@ -9,3 +9,4 @@
|
||||
#
|
||||
|
||||
_man
|
||||
|
||||
|
||||
@ -18,3 +18,4 @@ function mand {
|
||||
}
|
||||
|
||||
mand "$@"
|
||||
|
||||
|
||||
@ -17,3 +17,4 @@ function manp {
|
||||
}
|
||||
|
||||
manp "$@"
|
||||
|
||||
|
||||
@ -39,3 +39,4 @@ EOF
|
||||
end tell
|
||||
EOF
|
||||
}
|
||||
|
||||
|
||||
@ -63,3 +63,4 @@ Authors
|
||||
[1]: http://www.archlinux.org/pacman/
|
||||
[2]: http://archlinux.fr/yaourt-en
|
||||
[3]: https://github.com/sorin-ionescu/prezto/issues
|
||||
|
||||
|
||||
@ -20,3 +20,4 @@ find /bin /etc /lib /sbin /usr \
|
||||
\( -type d -printf '%p/\n' -o -print \) | sort > "$fs"
|
||||
|
||||
comm -23 "$fs" "$db"
|
||||
|
||||
|
||||
@ -18,3 +18,4 @@ pacman --query --explicit --info \
|
||||
print $2
|
||||
}
|
||||
'
|
||||
|
||||
|
||||
@ -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
|
||||
# repositories.
|
||||
if (( $+commands[abs] )); then
|
||||
alias pacu="${_pacman_sudo}${_pacman_frontend} --sync --refresh && sudo abs"
|
||||
alias pacu="${_pacman_sudo}${_pacman_frontend} --sync --refresh && ${_pacman_sudo}abs"
|
||||
else
|
||||
alias pacu="${_pacman_sudo}${_pacman_frontend} --sync --refresh"
|
||||
fi
|
||||
@ -82,3 +82,4 @@ fi
|
||||
alias pacU="${_pacman_sudo}${_pacman_frontend} --sync --refresh --sysupgrade"
|
||||
|
||||
unset _pacman_{frontend,sudo}
|
||||
|
||||
|
||||
@ -16,3 +16,4 @@ fi
|
||||
|
||||
# Manages .pac* files.
|
||||
alias pacc='yaourt -C'
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Perl
|
||||
====
|
||||
|
||||
Enables local [Perl][1] module installation on Mac OS X and defines aliases.
|
||||
Enables local [Perl][1] module installation on Mac OS X and defines alises.
|
||||
|
||||
Local Module Installation
|
||||
-------------------------
|
||||
@ -61,3 +61,4 @@ Authors
|
||||
[1]: http://www.perl.org
|
||||
[2]: http://perlbrew.pl
|
||||
[3]: https://github.com/sorin-ionescu/prezto/issues
|
||||
|
||||
|
||||
@ -50,3 +50,4 @@ alias plbO='perlbrew switch-off'
|
||||
alias plbs='perlbrew switch'
|
||||
alias plbu='perlbrew use'
|
||||
alias plbx='perlbrew uninstall'
|
||||
|
||||
|
||||
@ -109,3 +109,4 @@ Authors
|
||||
[1]: http://zsh.sourceforge.net/Doc/Release/User-Contributions.html#Prompt-Themes
|
||||
[2]: http://zsh.sourceforge.net/Doc/Release/Functions.html#Hook-Functions
|
||||
[3]: https://github.com/sorin-ionescu/prezto/issues
|
||||
|
||||
|
||||
1
modules/prompt/external/agnoster
vendored
1
modules/prompt/external/agnoster
vendored
Submodule modules/prompt/external/agnoster deleted from 43cb371f36
1
modules/prompt/external/powerline
vendored
1
modules/prompt/external/powerline
vendored
Submodule modules/prompt/external/powerline deleted from 8e81152340
1
modules/prompt/external/pure
vendored
1
modules/prompt/external/pure
vendored
Submodule modules/prompt/external/pure deleted from 2577a4cc07
@ -1 +0,0 @@
|
||||
../external/agnoster/agnoster.zsh-theme
|
||||
@ -1,121 +0,0 @@
|
||||
#
|
||||
# A minimal two-color theme.
|
||||
#
|
||||
# Authors:
|
||||
# Kevin Laude <nerfyoda@gmail.com>
|
||||
#
|
||||
# Features:
|
||||
# - One line, left aligned.
|
||||
# - The prompt is prefixed by a character sequence of your choice.
|
||||
# - Only displays the current directory instead of the full path.
|
||||
# - Displays the current branch when in a git project (this requires loading
|
||||
# the git module before prompt in ~/.zpreztorc).
|
||||
# - Displays a character at the end of the prompt when in a git project with
|
||||
# "dirty" files.
|
||||
#
|
||||
# Usage:
|
||||
# This prompt's prefix symbol and colors are customizable:
|
||||
# prompt cloud [<symbol>] [<color1>] [<color2>]
|
||||
#
|
||||
# In ~/.zpreztorc:
|
||||
# zstyle ':prezto:module:prompt' theme 'cloud' \
|
||||
# ['<symbol>'] \
|
||||
# ['<color1>'] \
|
||||
# ['<color2>']
|
||||
#
|
||||
# If these options are not provided, the symbol defaults to "☁" with colors
|
||||
# cyan and green.
|
||||
#
|
||||
# Screenshots:
|
||||
# http://i.imgur.com/mJCZ8rE.png
|
||||
#
|
||||
# Note:
|
||||
# This is a port of the oh-my-zsh cloud theme, originally written by Phillip
|
||||
# Ridlen <p@rdln.net> and Mark Drago <markdrago@gmail.com>
|
||||
#
|
||||
|
||||
# Load dependencies.
|
||||
pmodload 'helper'
|
||||
|
||||
function prompt_cloud_precmd {
|
||||
setopt LOCAL_OPTIONS
|
||||
unsetopt XTRACE KSH_ARRAYS
|
||||
|
||||
# Get Git repository information.
|
||||
if (( $+functions[git-info] )); then
|
||||
git-info
|
||||
fi
|
||||
}
|
||||
|
||||
function prompt_cloud_help {
|
||||
cat <<EOT
|
||||
This prompt's prefix symbol and colors are customizable:
|
||||
|
||||
prompt cloud [<symbol>] [<color1>] [<color2>]
|
||||
|
||||
In ~/.zpreztorc:
|
||||
zstyle ':prezto:module:prompt' theme 'cloud' ['<symbol>'] ['<color1>'] ['<color2>']
|
||||
|
||||
If these options are not provided, the symbol defaults to ☁ with colors cyan
|
||||
and green.
|
||||
EOT
|
||||
}
|
||||
|
||||
function prompt_cloud_preview {
|
||||
if (( $# > 0 )); then
|
||||
prompt_preview_theme 'cloud' "$@"
|
||||
else
|
||||
prompt_preview_theme 'cloud'
|
||||
print
|
||||
prompt_preview_theme 'cloud' "✯"
|
||||
print
|
||||
prompt_preview_theme 'cloud' ">" "yellow" "red"
|
||||
fi
|
||||
}
|
||||
|
||||
function prompt_cloud_setup {
|
||||
setopt LOCAL_OPTIONS
|
||||
unsetopt XTRACE KSH_ARRAYS
|
||||
prompt_opts=(cr percent subst)
|
||||
|
||||
# Set the theme prefix to a cloud or to the user's given characters.
|
||||
if [[ -n "$1" ]]; then
|
||||
prefix="$1"
|
||||
else
|
||||
prefix='☁'
|
||||
fi
|
||||
|
||||
# Assign colors.
|
||||
if [[ -n "$2" ]]; then
|
||||
primary_color="$2"
|
||||
else
|
||||
primary_color='cyan'
|
||||
fi
|
||||
|
||||
if [[ -n "$3" ]]; then
|
||||
secondary_color="$3"
|
||||
else
|
||||
secondary_color='green'
|
||||
fi
|
||||
|
||||
# Load required functions.
|
||||
autoload -Uz add-zsh-hook
|
||||
|
||||
# Add hook for calling git-info before each command.
|
||||
add-zsh-hook precmd prompt_cloud_precmd
|
||||
|
||||
# Set git-info parameters.
|
||||
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:clean' format "%B%F{$secondary_color}]%f%b"
|
||||
zstyle ':prezto:module:git:info:branch' format "%%B%F{$secondary_color}[%f%%b%%B%F{$primary_color}%b%f%%b"
|
||||
zstyle ':prezto:module:git:info:keys' format \
|
||||
'prompt' '%b%C%D' \
|
||||
'rprompt' ''
|
||||
|
||||
# Define prompts.
|
||||
PROMPT='%B%F{$primary_color}${prefix}%f%b %B%F{$secondary_color}%c%f%b $git_info[prompt] '
|
||||
RPROMPT=''
|
||||
}
|
||||
|
||||
prompt_cloud_setup "$@"
|
||||
@ -1,76 +0,0 @@
|
||||
#
|
||||
# A simple theme inspired by the Sorin and PeepCode themes.
|
||||
#
|
||||
# Authors:
|
||||
# Daniel Møller Kristensen <damoekri@icloud.com>
|
||||
#
|
||||
# Screenshots:
|
||||
# http://i.imgur.com/AX9HnPF.png
|
||||
#
|
||||
|
||||
# Load dependencies.
|
||||
pmodload 'helper'
|
||||
|
||||
function prompt_damoekri_pwd {
|
||||
local pwd="${PWD/#$HOME/~}"
|
||||
|
||||
if [[ "$pwd" == (#m)[/~] ]]; then
|
||||
_prompt_damoekri_pwd="$MATCH"
|
||||
unset MATCH
|
||||
else
|
||||
_prompt_damoekri_pwd="${${${${(@j:/:M)${(@s:/:)pwd}##.#?}:h}%/}//\%/%%}/${${pwd:t}//\%/%%}"
|
||||
fi
|
||||
}
|
||||
|
||||
function prompt_damoekri_precmd {
|
||||
setopt LOCAL_OPTIONS
|
||||
unsetopt XTRACE KSH_ARRAYS
|
||||
|
||||
# Format PWD.
|
||||
prompt_damoekri_pwd
|
||||
|
||||
# Get Git repository information.
|
||||
if (( $+functions[git-info] )); then
|
||||
git-info
|
||||
fi
|
||||
|
||||
# Get Ruby version information.
|
||||
if (( $+functions[ruby-info] )); then
|
||||
ruby-info
|
||||
fi
|
||||
}
|
||||
|
||||
function prompt_damoekri_setup {
|
||||
setopt LOCAL_OPTIONS
|
||||
unsetopt XTRACE KSH_ARRAYS
|
||||
prompt_opts=(cr percent subst)
|
||||
|
||||
# Load required functions.
|
||||
autoload -Uz add-zsh-hook
|
||||
|
||||
# Add hook for calling git-info and ruby-info before each command.
|
||||
add-zsh-hook precmd prompt_damoekri_precmd
|
||||
|
||||
# Set editor-info parameters.
|
||||
zstyle ':prezto:module:editor:info:keymap:primary' format ' %F{green}»%f'
|
||||
|
||||
# Set git-info parameters.
|
||||
zstyle ':prezto:module:git:info' verbose 'yes'
|
||||
zstyle ':prezto:module:git:info:action' format ':%F{magenta}%s%f'
|
||||
zstyle ':prezto:module:git:info:branch' format '%F{blue}%b%f'
|
||||
zstyle ':prezto:module:git:info:clean' format ' %F{green}✔%f'
|
||||
zstyle ':prezto:module:git:info:dirty' format ' %F{red}✗%f'
|
||||
zstyle ':prezto:module:git:info:commit' format '%F{blue}%.7c%f'
|
||||
zstyle ':prezto:module:git:info:position' format '%F{blue}%p%f'
|
||||
zstyle ':prezto:module:git:info:keys' format \
|
||||
'rprompt' ' $(coalesce "%b" "%p" "%c")%s%C%D'
|
||||
|
||||
# Set ruby-info parameters.
|
||||
zstyle ':prezto:module:ruby:info:version' format ' %F{yellow}%v%f'
|
||||
|
||||
# Define prompts.
|
||||
PROMPT='%F{cyan}${_prompt_damoekri_pwd}%f${editor_info[keymap]} '
|
||||
RPROMPT='${git_info:+${(e)git_info[rprompt]}}${ruby_info:+${ruby_info[version]}}'
|
||||
}
|
||||
|
||||
prompt_damoekri_setup "$@"
|
||||
@ -1,76 +0,0 @@
|
||||
#
|
||||
# A colorful, friendly, multiline theme with some handy features.
|
||||
#
|
||||
# Authors:
|
||||
# Paul Gideon Dann <pdgiddie@gmail.com>
|
||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||
#
|
||||
# Features:
|
||||
# - Simple VCS branch, staged, and unstaged indication.
|
||||
# - Prompt character is different in a VCS repository.
|
||||
# - Last command exit status is displayed when non-zero.
|
||||
#
|
||||
# Screenshots:
|
||||
# http://i.imgur.com/rCo3S.png
|
||||
#
|
||||
|
||||
function +vi-set_novcs_prompt_symbol {
|
||||
_prompt_giddie_symbol=')'
|
||||
}
|
||||
|
||||
function +vi-set_vcs_prompt_symbol {
|
||||
_prompt_giddie_symbol='±'
|
||||
}
|
||||
|
||||
function +vi-git_precmd {
|
||||
# Check for untracked files, since vcs_info does not.
|
||||
if [[ -n $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
|
||||
hook_com[unstaged]+='%F{green}?%f'
|
||||
fi
|
||||
}
|
||||
|
||||
function prompt_giddie_precmd {
|
||||
# Replace '/home/<user>' with '~'.
|
||||
_prompt_giddie_pwd="${PWD/#$HOME/~}"
|
||||
vcs_info
|
||||
}
|
||||
|
||||
function prompt_giddie_setup {
|
||||
setopt LOCAL_OPTIONS
|
||||
unsetopt XTRACE KSH_ARRAYS
|
||||
prompt_opts=(cr percent subst)
|
||||
|
||||
# Load required functions.
|
||||
autoload -Uz vcs_info
|
||||
autoload -Uz add-zsh-hook
|
||||
|
||||
# Add hook to set up prompt parameters before each command.
|
||||
add-zsh-hook precmd prompt_giddie_precmd
|
||||
|
||||
# Set editor-info parameters.
|
||||
zstyle ':prezto:module:editor:info:completing' format '%F{green}...%f'
|
||||
zstyle ':prezto:module:editor:info:keymap:alternate' format '%F{yellow}--- COMMAND ---%f'
|
||||
|
||||
# Set vcs_info parameters.
|
||||
zstyle ':vcs_info:*' check-for-changes true
|
||||
zstyle ':vcs_info:*' formats ' on %F{magenta}%b%f%c%u'
|
||||
zstyle ':vcs_info:*' actionformats ' on %F{magenta}%b%f%c%u %F{yellow}(%a)%f'
|
||||
zstyle ':vcs_info:*' stagedstr '%F{green}+%f'
|
||||
zstyle ':vcs_info:*' unstagedstr '%F{green}!%f'
|
||||
|
||||
# Set vcs_info hooks.
|
||||
# NOTE: Prior to Zsh v4.3.12, there are no static hooks, no vcs_info_hookadd
|
||||
# function, and no 'no-vcs' hook.
|
||||
zstyle ':vcs_info:*+start-up:*' hooks set_novcs_prompt_symbol
|
||||
zstyle ':vcs_info:git*+set-message:*' hooks set_vcs_prompt_symbol git_precmd
|
||||
zstyle ':vcs_info:*+set-message:*' hooks set_vcs_prompt_symbol
|
||||
|
||||
# Define prompts.
|
||||
PROMPT='%(?..%F{red}%B-> [%?]%b%f
|
||||
)%F{magenta}%n%f@%F{yellow}%m%f|%F{green}${_prompt_giddie_pwd}%f${vcs_info_msg_0_}
|
||||
%F{blue}${_prompt_giddie_symbol}%f '
|
||||
RPROMPT='${editor_info[keymap]}'
|
||||
SPROMPT='zsh: correct %F{magenta}%R%f to %F{green}%r%f [nyae]? '
|
||||
}
|
||||
|
||||
prompt_giddie_setup "$@"
|
||||
@ -1,65 +0,0 @@
|
||||
#
|
||||
# A single line theme with Git information on the left and Ruby on the right.
|
||||
#
|
||||
# Authors:
|
||||
# Kyle West <kswest@gmail.com>
|
||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||
#
|
||||
# Features:
|
||||
# - Indicates dirty Git repository.
|
||||
# - Indicates the Ruby version.
|
||||
# - Indicates vi modes.
|
||||
#
|
||||
# Screenshots:
|
||||
# http://i.imgur.com/dCwhynn.png
|
||||
#
|
||||
|
||||
function prompt_kylewest_precmd {
|
||||
setopt LOCAL_OPTIONS
|
||||
unsetopt XTRACE KSH_ARRAYS
|
||||
|
||||
# Get Git repository information.
|
||||
if (( $+functions[git-info] )); then
|
||||
git-info
|
||||
fi
|
||||
|
||||
# Get Ruby information.
|
||||
if (( $+functions[ruby-info] )); then
|
||||
ruby-info
|
||||
fi
|
||||
}
|
||||
|
||||
function prompt_kylewest_setup {
|
||||
setopt LOCAL_OPTIONS
|
||||
unsetopt XTRACE KSH_ARRAYS
|
||||
prompt_opts=(cr percent subst)
|
||||
|
||||
# Load required functions.
|
||||
autoload -Uz add-zsh-hook
|
||||
|
||||
# Add hook for calling git-info before each command.
|
||||
add-zsh-hook precmd prompt_kylewest_precmd
|
||||
|
||||
# Set editor-info parameters.
|
||||
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:alternate' format "%B%F{magenta}❮%f%b"
|
||||
|
||||
# Set git-info parameters.
|
||||
zstyle ':prezto:module:git:info' verbose 'no'
|
||||
zstyle ':prezto:module:git:info:branch' format '%F{yellow}%b%f'
|
||||
zstyle ':prezto:module:git:info:dirty' format '%B%F{red}!%f%b'
|
||||
zstyle ':prezto:module:git:info:indexed' format ' '
|
||||
zstyle ':prezto:module:git:info:unindexed' format ' '
|
||||
zstyle ':prezto:module:git:info:untracked' format ' '
|
||||
zstyle ':prezto:module:git:info:keys' format 'prompt' '- %b%D '
|
||||
|
||||
# Set ruby-info parameters.
|
||||
zstyle ':prezto:module:ruby:info:version' format '%F{blue}[%v]%f'
|
||||
|
||||
# Define prompts.
|
||||
PROMPT='%F{cyan}%c%f ${git_info[prompt]}${editor_info[keymap]} '
|
||||
RPROMPT='${ruby_info[version]}'
|
||||
}
|
||||
|
||||
prompt_kylewest_setup "$@"
|
||||
@ -9,7 +9,7 @@
|
||||
# http://i.imgur.com/zLZNK.png
|
||||
#
|
||||
|
||||
function +vi-git_status {
|
||||
function +vi-git-status() {
|
||||
# Check for untracked files or updated submodules since vcs_info does not.
|
||||
if [[ -n $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
|
||||
hook_com[unstaged]='%F{red}●%f'
|
||||
@ -40,7 +40,7 @@ function prompt_minimal_setup {
|
||||
zstyle ':vcs_info:*' formats ' - [%b%c%u]'
|
||||
zstyle ':vcs_info:*' actionformats " - [%b%c%u|%F{cyan}%a%f]"
|
||||
zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat '%b|%F{cyan}%r%f'
|
||||
zstyle ':vcs_info:git*+set-message:*' hooks git_status
|
||||
zstyle ':vcs_info:git*+set-message:*' hooks git-status
|
||||
|
||||
# Define prompts.
|
||||
PROMPT='%2~${vcs_info_msg_0_} » '
|
||||
@ -48,3 +48,4 @@ function prompt_minimal_setup {
|
||||
}
|
||||
|
||||
prompt_minimal_setup "$@"
|
||||
|
||||
|
||||
@ -58,3 +58,4 @@ function prompt_nicoulaj_setup {
|
||||
}
|
||||
|
||||
prompt_nicoulaj_setup "$@"
|
||||
|
||||
|
||||
@ -1,154 +0,0 @@
|
||||
#
|
||||
# A two-line, Powerline-inspired theme that displays contextual information.
|
||||
#
|
||||
# This theme requires a patched Powerline font, get them from
|
||||
# https://github.com/Lokaltog/powerline-fonts.
|
||||
#
|
||||
# Authors:
|
||||
# Isaac Wolkerstorfer <i@agnoster.net>
|
||||
# Jeff Sandberg <paradox460@gmail.com>
|
||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||
#
|
||||
# Screenshots:
|
||||
# http://i.imgur.com/0XIWX.png
|
||||
#
|
||||
|
||||
# Load dependencies.
|
||||
pmodload 'helper'
|
||||
|
||||
# Define variables.
|
||||
_prompt_paradox_current_bg='NONE'
|
||||
_prompt_paradox_segment_separator='⮀'
|
||||
_prompt_paradox_start_time=$SECONDS
|
||||
|
||||
function prompt_paradox_start_segment {
|
||||
local bg fg
|
||||
[[ -n "$1" ]] && bg="%K{$1}" || bg="%k"
|
||||
[[ -n "$2" ]] && fg="%F{$2}" || fg="%f"
|
||||
if [[ "$_prompt_paradox_current_bg" != 'NONE' && "$1" != "$_prompt_paradox_current_bg" ]]; then
|
||||
print -n " $bg%F{$_prompt_paradox_current_bg}$_prompt_paradox_segment_separator$fg "
|
||||
else
|
||||
print -n "$bg$fg "
|
||||
fi
|
||||
_prompt_paradox_current_bg="$1"
|
||||
[[ -n "$3" ]] && print -n "$3"
|
||||
}
|
||||
|
||||
function prompt_paradox_end_segment {
|
||||
if [[ -n "$_prompt_paradox_current_bg" ]]; then
|
||||
print -n " %k%F{$_prompt_paradox_current_bg}$_prompt_paradox_segment_separator"
|
||||
else
|
||||
print -n "%k"
|
||||
fi
|
||||
print -n "%f"
|
||||
_prompt_paradox_current_bg=''
|
||||
}
|
||||
|
||||
function prompt_paradox_build_prompt {
|
||||
prompt_paradox_start_segment black default '%(?::%F{red}✘ )%(!:%F{yellow}⚡ :)%(1j:%F{cyan}⚙ :)%F{blue}%n%F{red}@%F{green}%m%f'
|
||||
prompt_paradox_start_segment blue black '$_prompt_paradox_pwd'
|
||||
|
||||
if [[ -n "$git_info" ]]; then
|
||||
prompt_paradox_start_segment green black '${(e)git_info[ref]}${(e)git_info[status]}'
|
||||
fi
|
||||
|
||||
prompt_paradox_end_segment
|
||||
}
|
||||
|
||||
function prompt_paradox_pwd {
|
||||
local pwd="${PWD/#$HOME/~}"
|
||||
|
||||
if [[ "$pwd" == (#m)[/~] ]]; then
|
||||
_prompt_paradox_pwd="$MATCH"
|
||||
unset MATCH
|
||||
else
|
||||
_prompt_paradox_pwd="${${${${(@j:/:M)${(@s:/:)pwd}##.#?}:h}%/}//\%/%%}/${${pwd:t}//\%/%%}"
|
||||
fi
|
||||
}
|
||||
|
||||
function prompt_paradox_print_elapsed_time {
|
||||
local end_time=$(( SECONDS - _prompt_paradox_start_time ))
|
||||
local hours minutes seconds remainder
|
||||
|
||||
if (( end_time >= 3600 )); then
|
||||
hours=$(( end_time / 3600 ))
|
||||
remainder=$(( end_time % 3600 ))
|
||||
minutes=$(( remainder / 60 ))
|
||||
seconds=$(( remainder % 60 ))
|
||||
print -P "%B%F{red}>>> elapsed time ${hours}h${minutes}m${seconds}s%b"
|
||||
elif (( end_time >= 60 )); then
|
||||
minutes=$(( end_time / 60 ))
|
||||
seconds=$(( end_time % 60 ))
|
||||
print -P "%B%F{yellow}>>> elapsed time ${minutes}m${seconds}s%b"
|
||||
elif (( end_time > 10 )); then
|
||||
print -P "%B%F{green}>>> elapsed time ${end_time}s%b"
|
||||
fi
|
||||
}
|
||||
|
||||
function prompt_paradox_precmd {
|
||||
setopt LOCAL_OPTIONS
|
||||
unsetopt XTRACE KSH_ARRAYS
|
||||
|
||||
# Format PWD.
|
||||
prompt_paradox_pwd
|
||||
|
||||
# Get Git repository information.
|
||||
if (( $+functions[git-info] )); then
|
||||
git-info
|
||||
fi
|
||||
|
||||
# Calculate and print the elapsed time.
|
||||
prompt_paradox_print_elapsed_time
|
||||
}
|
||||
|
||||
function prompt_paradox_preexec {
|
||||
_prompt_paradox_start_time="$SECONDS"
|
||||
}
|
||||
|
||||
function prompt_paradox_setup {
|
||||
setopt LOCAL_OPTIONS
|
||||
unsetopt XTRACE KSH_ARRAYS
|
||||
prompt_opts=(cr percent subst)
|
||||
|
||||
# Load required functions.
|
||||
autoload -Uz add-zsh-hook
|
||||
|
||||
# Add hook for calling git-info before each command.
|
||||
add-zsh-hook preexec prompt_paradox_preexec
|
||||
add-zsh-hook precmd prompt_paradox_precmd
|
||||
|
||||
# Set editor-info parameters.
|
||||
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:overwrite' format '%F{red}♺%f'
|
||||
zstyle ':prezto:module:editor:info:keymap:alternate' format '%B%F{red}❮%f%b'
|
||||
|
||||
# Set git-info parameters.
|
||||
zstyle ':prezto:module:git:info' verbose 'yes'
|
||||
zstyle ':prezto:module:git:info:action' format ' ⁝ %s'
|
||||
zstyle ':prezto:module:git:info:added' format ' ✚'
|
||||
zstyle ':prezto:module:git:info:ahead' format ' ⬆'
|
||||
zstyle ':prezto:module:git:info:behind' format ' ⬇'
|
||||
zstyle ':prezto:module:git:info:branch' format '⭠ %b'
|
||||
zstyle ':prezto:module:git:info:commit' format '➦ %.7c'
|
||||
zstyle ':prezto:module:git:info:deleted' format ' ✖'
|
||||
zstyle ':prezto:module:git:info:dirty' format ' ⁝'
|
||||
zstyle ':prezto:module:git:info:modified' format ' ✱'
|
||||
zstyle ':prezto:module:git:info:position' format '%p'
|
||||
zstyle ':prezto:module:git:info:renamed' format ' ➙'
|
||||
zstyle ':prezto:module:git:info:stashed' format ' S'
|
||||
zstyle ':prezto:module:git:info:unmerged' format ' ═'
|
||||
zstyle ':prezto:module:git:info:untracked' format ' ?'
|
||||
zstyle ':prezto:module:git:info:keys' format \
|
||||
'ref' '$(coalesce "%b" "%p" "%c")' \
|
||||
'status' '%s%D%A%B%S%a%d%m%r%U%u'
|
||||
|
||||
# Define prompts.
|
||||
PROMPT='
|
||||
${(e)$(prompt_paradox_build_prompt)}
|
||||
${editor_info[keymap]} '
|
||||
RPROMPT='%F{blue}[%F{green}%D{%H:%M:%S}%F{blue}]%f'
|
||||
SPROMPT='zsh: correct %F{red}%R%f to %F{green}%r%f [nyae]? '
|
||||
}
|
||||
|
||||
prompt_paradox_setup "$@"
|
||||
@ -10,13 +10,16 @@
|
||||
# http://i.imgur.com/LhgmW.png
|
||||
#
|
||||
|
||||
function prompt_peepcode_precmd {
|
||||
# Get Git repository information.
|
||||
if (( $+functions[git-info] )); then
|
||||
git-info
|
||||
function +vi-git-status() {
|
||||
# Check for untracked files or updated submodules since vcs_info does not.
|
||||
if [[ -n $(git ls-files --other --exclude-standard 2> /dev/null) ]]; then
|
||||
hook_com[unstaged]=' %F{8}✗%f'
|
||||
fi
|
||||
}
|
||||
|
||||
function prompt_peepcode_precmd {
|
||||
vcs_info
|
||||
|
||||
# Get Ruby information.
|
||||
if (( $+functions[ruby-info] )); then
|
||||
ruby-info
|
||||
fi
|
||||
@ -31,19 +34,18 @@ function prompt_peepcode_setup {
|
||||
autoload -Uz add-zsh-hook
|
||||
autoload -Uz vcs_info
|
||||
|
||||
# Add a hook for calling info functions before each command.
|
||||
# Add hook for calling vcs_info before each command.
|
||||
add-zsh-hook precmd prompt_peepcode_precmd
|
||||
|
||||
# Set git-info parameters.
|
||||
zstyle ':prezto:module:git:info' verbose 'no'
|
||||
zstyle ':prezto:module:git:info:action' format ' +%s'
|
||||
zstyle ':prezto:module:git:info:branch' format ' %F{8}%b%f'
|
||||
zstyle ':prezto:module:git:info:commit' format ' %F{white}%.7c%f'
|
||||
zstyle ':prezto:module:git:info:indexed' format ' '
|
||||
zstyle ':prezto:module:git:info:unindexed' format ' '
|
||||
zstyle ':prezto:module:git:info:untracked' format ' '
|
||||
zstyle ':prezto:module:git:info:dirty' format ' %F{8}✗%f'
|
||||
zstyle ':prezto:module:git:info:keys' format 'rprompt' '%b%c%s%D'
|
||||
# Set vcs_info parameters.
|
||||
zstyle ':vcs_info:*' enable git
|
||||
zstyle ':vcs_info:*' check-for-changes true
|
||||
zstyle ':vcs_info:*' get-revision true
|
||||
zstyle ':vcs_info:*' use-simple true
|
||||
zstyle ':vcs_info:*' unstagedstr ' %F{8}✗%f'
|
||||
zstyle ':vcs_info:*' formats ' %F{8}%b%f %F{white}%.7i%f%u'
|
||||
zstyle ':vcs_info:*' actionformats ' %F{8}%b%f %F{white}%.7i%f +%a%u'
|
||||
zstyle ':vcs_info:git*+set-message:*' hooks git-status
|
||||
|
||||
# Set ruby-info parameters.
|
||||
zstyle ':prezto:module:ruby:info:version' format ' %F{white}%v%f'
|
||||
@ -52,7 +54,7 @@ function prompt_peepcode_setup {
|
||||
PROMPT="
|
||||
%~
|
||||
%(?.%F{green}${1:-☻ }%f.%F{red}${1:-☻ }%f) "
|
||||
RPROMPT='${ruby_info[version]}${git_info[rprompt]}'
|
||||
RPROMPT='${ruby_info[version]}${vcs_info_msg_0_}'
|
||||
|
||||
}
|
||||
|
||||
@ -83,3 +85,4 @@ function prompt_peepcode_preview {
|
||||
}
|
||||
|
||||
prompt_peepcode_setup "$@"
|
||||
|
||||
|
||||
@ -1 +0,0 @@
|
||||
../external/powerline/prompt_powerline_setup
|
||||
@ -1 +0,0 @@
|
||||
../external/pure/pure.zsh
|
||||
@ -1,75 +0,0 @@
|
||||
#
|
||||
# A single line theme with Git information on the left and Ruby on the right.
|
||||
#
|
||||
# Authors:
|
||||
# Steve Losh <steve@stevelosh.com>
|
||||
# Bart Trojanowski <bart@jukie.net>
|
||||
# Brian Carper <brian@carper.ca>
|
||||
# steeef <steeef@gmail.com>
|
||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||
# Yan Pritzker <yan@pritzker.ws>
|
||||
#
|
||||
# Screenshots:
|
||||
# http://i.imgur.com/gLgVp6Y.png
|
||||
#
|
||||
|
||||
function prompt_skwp_precmd {
|
||||
# Get Git repository information.
|
||||
if (( $+functions[git-info] )); then
|
||||
git-info
|
||||
fi
|
||||
|
||||
# Get Ruby information.
|
||||
if (( $+functions[ruby-info] )); then
|
||||
ruby-info
|
||||
fi
|
||||
}
|
||||
|
||||
function prompt_skwp_setup {
|
||||
setopt LOCAL_OPTIONS
|
||||
unsetopt XTRACE KSH_ARRAYS
|
||||
prompt_opts=(cr percent subst)
|
||||
|
||||
# Load required functions.
|
||||
autoload -Uz add-zsh-hook
|
||||
|
||||
# Add hook to set up prompt parameters before each command.
|
||||
add-zsh-hook precmd prompt_skwp_precmd
|
||||
|
||||
# Use extended color pallete if available.
|
||||
if [[ $TERM = *256color* || $TERM = *rxvt* ]]; then
|
||||
_prompt_skwp_colors=(
|
||||
"%F{81}" # Turquoise
|
||||
"%F{166}" # Orange
|
||||
"%F{135}" # Purple
|
||||
"%F{161}" # Hotpink
|
||||
"%F{118}" # Limegreen
|
||||
)
|
||||
else
|
||||
_prompt_skwp_colors=(
|
||||
"%F{cyan}"
|
||||
"%F{yellow}"
|
||||
"%F{magenta}"
|
||||
"%F{red}"
|
||||
"%F{green}"
|
||||
)
|
||||
fi
|
||||
|
||||
# Set git-info parameters.
|
||||
zstyle ':prezto:module:git:info' verbose 'yes'
|
||||
zstyle ':prezto:module:git:info:branch' format "${_prompt_skwp_colors[1]}%b%f"
|
||||
zstyle ':prezto:module:git:info:added' format "${_prompt_skwp_colors[5]}●%f"
|
||||
zstyle ':prezto:module:git:info:deleted' format "${_prompt_skwp_colors[2]}●%f"
|
||||
zstyle ':prezto:module:git:info:modified' format "${_prompt_skwp_colors[4]}●%f"
|
||||
zstyle ':prezto:module:git:info:untracked' format "${_prompt_skwp_colors[3]}●%f"
|
||||
zstyle ':prezto:module:git:info:keys' format 'prompt' '(%b%d%a%m%u)'
|
||||
|
||||
# Set ruby-info parameters.
|
||||
zstyle ':prezto:module:ruby:info:version' format '[%v]'
|
||||
|
||||
# Define prompts.
|
||||
PROMPT="${_prompt_skwp_colors[3]}%n%f@${_prompt_skwp_colors[2]}%m%f ${_prompt_skwp_colors[5]}%~%f "'$git_info[prompt]'"$ "
|
||||
RPROMPT='%F{blue}${ruby_info[version]}'
|
||||
}
|
||||
|
||||
prompt_skwp_setup "$@"
|
||||
@ -1,65 +0,0 @@
|
||||
#
|
||||
# A simple theme that displays:
|
||||
# - Python virtual environment.
|
||||
# - Git branch.
|
||||
# - Git state.
|
||||
# - Last command exit state (smiley/X).
|
||||
#
|
||||
# Authors:
|
||||
# Nadav Shatz <nadavshatz@gmail.com>
|
||||
#
|
||||
# Screenshots:
|
||||
# http://i.imgur.com/ijycV6n.png
|
||||
#
|
||||
|
||||
# Load dependencies.
|
||||
pmodload 'helper'
|
||||
|
||||
function prompt_smiley_precmd {
|
||||
unsetopt XTRACE KSH_ARRAYS
|
||||
|
||||
# Get Git repository information.
|
||||
if (( $+functions[git-info] )); then
|
||||
git-info
|
||||
fi
|
||||
|
||||
# Get Python environment information.
|
||||
if (( $+functions[python-info] )); then
|
||||
python-info
|
||||
fi
|
||||
|
||||
# Get Ruby version information.
|
||||
if (( $+functions[ruby-info] )); then
|
||||
ruby-info
|
||||
fi
|
||||
}
|
||||
|
||||
function prompt_smiley_setup {
|
||||
unsetopt XTRACE KSH_ARRAYS
|
||||
prompt_opts=(percent subst)
|
||||
|
||||
# Add hook for calling git-info before each command.
|
||||
add-zsh-hook precmd prompt_smiley_precmd
|
||||
|
||||
# Set editor-info parameters.
|
||||
zstyle ':prezto:module:editor:info:completing' format '%B%F{red}...%f%b'
|
||||
|
||||
# Set python-info parameters.
|
||||
zstyle ':prezto:module:python:info:virtualenv' format '%F{yellow}[%v]%f '
|
||||
|
||||
# Set ruby-info parameters.
|
||||
zstyle ':prezto:module:ruby:info:version' format '%F{yellow}[%v]%f '
|
||||
|
||||
# Set git-info parameters.
|
||||
zstyle ':prezto:module:git:info' verbose 'yes'
|
||||
zstyle ':prezto:module:git:info:branch' format '%F{blue}%b%f'
|
||||
zstyle ':prezto:module:git:info:dirty' format '%%B%F{red} ±%f%%b'
|
||||
zstyle ':prezto:module:git:info:keys' format 'prompt' '(%b%D)'
|
||||
|
||||
# Define prompts.
|
||||
PROMPT='$python_info[virtualenv]$ruby_info[version]${git_info[prompt]} %B%c%b %(?:%F{green}ツ%f:%F{red}✖%f) '
|
||||
RPROMPT='${editor_info[overwrite]}${VIM:+" %B%F{green}V%f%b"}'
|
||||
SPROMPT='zsh: correct %F{red}%R%f to %F{green}%r%f [nyae]? '
|
||||
}
|
||||
|
||||
prompt_smiley_setup "$@"
|
||||
@ -5,7 +5,7 @@
|
||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||
#
|
||||
# Screenshots:
|
||||
# http://i.imgur.com/AzjmpwM.png
|
||||
# http://i.imgur.com/nBEEZ.png
|
||||
#
|
||||
|
||||
# Load dependencies.
|
||||
@ -72,9 +72,10 @@ function prompt_sorin_setup {
|
||||
'rprompt' '%A%B%S%a%d%m%r%U%u'
|
||||
|
||||
# Define prompts.
|
||||
PROMPT='${SSH_TTY:+"%F{red}%n%f@%F{yellow}%m%f "}%F{cyan}${_prompt_sorin_pwd}%f${git_info:+${(e)git_info[prompt]}}%(!. %B%F{red}#%f%b.)${editor_info[keymap]} '
|
||||
RPROMPT='${editor_info[overwrite]}%(?:: %F{red}⏎%f)${VIM:+" %B%F{green}V%f%b"}${INSIDE_EMACS:+" %B%F{green}E%f%b"}${git_info[rprompt]}'
|
||||
PROMPT='%F{cyan}${_prompt_sorin_pwd}%f${git_info:+${(e)git_info[prompt]}}%(!. %B%F{red}#%f%b.)${editor_info[keymap]} '
|
||||
RPROMPT='${editor_info[overwrite]}%(?:: %F{red}⏎%f)${VIM:+" %B%F{green}V%f%b"}${git_info[rprompt]}'
|
||||
SPROMPT='zsh: correct %F{red}%R%f to %F{green}%r%f [nyae]? '
|
||||
}
|
||||
|
||||
prompt_sorin_setup "$@"
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user