mirror of
				https://github.com/dcarrillo/prezto.git
				synced 2025-11-04 07:29:09 +00:00 
			
		
		
		
	Compare commits
	
		
			2 Commits
		
	
	
		
			pull/599-t
			...
			issue/656-
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 
						 | 
					2d1881c466 | ||
| 
						 | 
					dc06819808 | 
							
								
								
									
										3
									
								
								.gitmodules
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								.gitmodules
									
									
									
									
										vendored
									
									
								
							@@ -7,3 +7,6 @@
 | 
			
		||||
[submodule "modules/completion/external"]
 | 
			
		||||
	path = modules/completion/external
 | 
			
		||||
	url = https://github.com/zsh-users/zsh-completions.git
 | 
			
		||||
[submodule "modules/z/external"]
 | 
			
		||||
	path = modules/z/external
 | 
			
		||||
	url = https://github.com/rupa/z.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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -114,3 +114,4 @@ SOFTWARE.
 | 
			
		||||
[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,38 +0,0 @@
 | 
			
		||||
Fasd
 | 
			
		||||
====
 | 
			
		||||
 | 
			
		||||
[Fasd][1] is a command-line productivity booster, inspired by tools like
 | 
			
		||||
[autojump][2], [z][3] and [v][4], it offers quick access to files and
 | 
			
		||||
directories by keeping track of files and directories  that were previously
 | 
			
		||||
accessed.
 | 
			
		||||
 | 
			
		||||
For completion to work, this module must be loaded **after** the *completion*
 | 
			
		||||
module.
 | 
			
		||||
 | 
			
		||||
The Prezto Fasd configuration differs from the default. The default aliases have
 | 
			
		||||
been disabled.
 | 
			
		||||
 | 
			
		||||
Aliases
 | 
			
		||||
-------
 | 
			
		||||
 | 
			
		||||
  - `j` changes the current working directory interactively.
 | 
			
		||||
 | 
			
		||||
Completion
 | 
			
		||||
----------
 | 
			
		||||
 | 
			
		||||
Type `,`, `f,`, `d,` in front of a comma-separated query or type `,,`,  `,,f`,
 | 
			
		||||
`,,d` at the end of a comma-separated query then hit <kbd>tab</kbd>.
 | 
			
		||||
 | 
			
		||||
Authors
 | 
			
		||||
-------
 | 
			
		||||
 | 
			
		||||
*The authors of this module should be contacted via the [issue tracker][5].*
 | 
			
		||||
 | 
			
		||||
  - [Wei Dai](https://github.com/clvv)
 | 
			
		||||
  - [Sorin Ionescu](https://github.com/sorin-ionescu)
 | 
			
		||||
 | 
			
		||||
[1]: https://github.com/clvv/fasd
 | 
			
		||||
[2]: https://github.com/joelthelion/autojump
 | 
			
		||||
[3]: https://github.com/rupa/z
 | 
			
		||||
[4]: https://github.com/rupa/v
 | 
			
		||||
[5]: https://github.com/sorin-ionescu/prezto/issues
 | 
			
		||||
@@ -1,53 +0,0 @@
 | 
			
		||||
#
 | 
			
		||||
# Maintains a frequently used file and directory list for fast access.
 | 
			
		||||
#
 | 
			
		||||
# Authors:
 | 
			
		||||
#   Wei Dai <x@wei23.net>
 | 
			
		||||
#   Sorin Ionescu <sorin.ionescu@gmail.com>
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
# Load dependencies.
 | 
			
		||||
pmodload 'editor'
 | 
			
		||||
 | 
			
		||||
# Return if requirements are not found.
 | 
			
		||||
if (( ! $+commands[fasd] )); then
 | 
			
		||||
  return 1
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
#
 | 
			
		||||
# Initialization
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
cache_file="${0:h}/cache.zsh"
 | 
			
		||||
if [[ "${commands[fasd]}" -nt "$cache_file" || ! -s "$cache_file"  ]]; then
 | 
			
		||||
  # Set the base init arguments.
 | 
			
		||||
  init_args=(zsh-hook)
 | 
			
		||||
 | 
			
		||||
  # Set fasd completion init arguments, if applicable.
 | 
			
		||||
  if zstyle -t ':prezto:module:completion' loaded; then
 | 
			
		||||
    init_args+=(zsh-ccomp zsh-ccomp-install zsh-wcomp zsh-wcomp-install)
 | 
			
		||||
  fi
 | 
			
		||||
 | 
			
		||||
  # Cache init code.
 | 
			
		||||
  fasd --init "$init_args[@]" >! "$cache_file" 2> /dev/null
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
source "$cache_file"
 | 
			
		||||
 | 
			
		||||
unset cache_file init_args
 | 
			
		||||
 | 
			
		||||
function fasd_cd {
 | 
			
		||||
  local fasd_ret="$(fasd -d "$@")"
 | 
			
		||||
  if [[ -d "$fasd_ret" ]]; then
 | 
			
		||||
    cd "$fasd_ret"
 | 
			
		||||
  else
 | 
			
		||||
    print "$fasd_ret"
 | 
			
		||||
  fi
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#
 | 
			
		||||
# Aliases
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
# 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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -179,3 +179,4 @@ alias gwc='git clean -n'
 | 
			
		||||
alias gwC='git clean -f'
 | 
			
		||||
alias gwx='git rm -r'
 | 
			
		||||
alias gwX='git rm -rf'
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -45,3 +45,4 @@ case "$state" in
 | 
			
		||||
esac
 | 
			
		||||
 | 
			
		||||
return $ret
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -9,3 +9,4 @@
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
_arguments '1:url:' && return 0
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -38,3 +38,4 @@ case "$state" in
 | 
			
		||||
esac
 | 
			
		||||
 | 
			
		||||
return $ret
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -24,3 +24,4 @@ done < <(
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
_describe -t submodule 'submodules' submodules && return 0
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -18,3 +18,4 @@ if [[ -n "$ref" ]]; then
 | 
			
		||||
else
 | 
			
		||||
  return 1
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -18,3 +18,4 @@ git fsck 2> /dev/null \
 | 
			
		||||
      --no-walk \
 | 
			
		||||
      --stdin \
 | 
			
		||||
      --pretty=format:${_git_log_oneline_format}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -14,3 +14,4 @@ else
 | 
			
		||||
  print "$0: not a repository: $PWD" >&2
 | 
			
		||||
  return 1
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -421,3 +421,4 @@ function git-info {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
git-info "$@"
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -14,3 +14,4 @@ else
 | 
			
		||||
  print "$0: not a repository work tree: $PWD" >&2
 | 
			
		||||
  return 1
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -20,3 +20,4 @@ if [[ -f "$(git-dir)/refs/stash" ]]; then
 | 
			
		||||
    fi
 | 
			
		||||
  fi
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -20,3 +20,4 @@ git fsck --unreachable 2> /dev/null \
 | 
			
		||||
      --merges \
 | 
			
		||||
      --no-walk \
 | 
			
		||||
      --stdin
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -16,3 +16,4 @@ for commit in "$@"; do
 | 
			
		||||
  git update-ref \
 | 
			
		||||
    -m "$(git log -1 --pretty="format:%s" "$commit")" refs/stash "$commit"
 | 
			
		||||
done
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -30,3 +30,4 @@ git-submodule-remove "$src"
 | 
			
		||||
git submodule add "$url" "$dst"
 | 
			
		||||
 | 
			
		||||
return 0
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -25,3 +25,4 @@ rm -rf "${1}"
 | 
			
		||||
rm -rf "$(git-dir)/modules/${1}"
 | 
			
		||||
 | 
			
		||||
return 0
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -15,3 +15,4 @@ pmodload 'helper'
 | 
			
		||||
 | 
			
		||||
# Source module files.
 | 
			
		||||
source "${0:h}/alias.zsh"
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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}"
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -22,3 +22,4 @@ if [[ "$version" == (none|) ]]; then
 | 
			
		||||
  zformat -f version_formatted "$version_format" "v:$version"
 | 
			
		||||
  node_info[version]="$version_formatted"
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -29,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'
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -48,3 +48,4 @@ function prompt_minimal_setup {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
prompt_minimal_setup "$@"
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -58,3 +58,4 @@ function prompt_nicoulaj_setup {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
prompt_nicoulaj_setup "$@"
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -85,3 +85,4 @@ function prompt_peepcode_preview {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
prompt_peepcode_setup "$@"
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -78,3 +78,4 @@ function prompt_sorin_setup {
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
prompt_sorin_setup "$@"
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -92,3 +92,4 @@ ${_prompt_steeef_colors[3]}%n%f at ${_prompt_steeef_colors[2]}%m%f in ${_prompt_
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
prompt_steeef_setup "$@"
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -16,3 +16,4 @@ else
 | 
			
		||||
  prompt 'off'
 | 
			
		||||
fi
 | 
			
		||||
unset prompt_argv
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -97,3 +97,4 @@ Authors
 | 
			
		||||
[3]: http://pypi.python.org/pypi/virtualenv
 | 
			
		||||
[4]: https://github.com/yyuu/pyenv
 | 
			
		||||
[5]: https://github.com/sorin-ionescu/prezto/issues
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -19,3 +19,4 @@ if [[ -n "$VIRTUAL_ENV" ]]; then
 | 
			
		||||
  zformat -f virtualenv_formatted "$virtualenv_format" "v:${VIRTUAL_ENV:t}"
 | 
			
		||||
  python_info[virtualenv]="$virtualenv_formatted"
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -35,14 +35,14 @@ if (( ! $+commands[python] && ! $+commands[pyenv] )); then
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
# Load virtualenvwrapper into the shell session.
 | 
			
		||||
if (( $+commands[virtualenvwrapper.sh] )); then
 | 
			
		||||
if (( $+commands[virtualenvwrapper_lazy.sh] )); then
 | 
			
		||||
  # Set the directory where virtual environments are stored.
 | 
			
		||||
  export WORKON_HOME="$HOME/.virtualenvs"
 | 
			
		||||
 | 
			
		||||
  # Disable the virtualenv prompt.
 | 
			
		||||
  VIRTUAL_ENV_DISABLE_PROMPT=1
 | 
			
		||||
 | 
			
		||||
  source "$commands[virtualenvwrapper.sh]"
 | 
			
		||||
  source "$commands[virtualenvwrapper_lazy.sh]"
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
#
 | 
			
		||||
@@ -50,3 +50,4 @@ fi
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
alias py='python'
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -32,3 +32,4 @@ Authors
 | 
			
		||||
 | 
			
		||||
[1]: http://rubyonrails.org
 | 
			
		||||
[2]: https://github.com/sorin-ionescu/prezto/issues
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -33,3 +33,4 @@ alias rorr='bundle exec rails runner'
 | 
			
		||||
alias rors='bundle exec rails server'
 | 
			
		||||
alias rorsd='bundle exec rails server --debugger'
 | 
			
		||||
alias rorx='bundle exec rails destroy'
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -25,3 +25,4 @@ Authors
 | 
			
		||||
[1]: http://rsync.samba.org
 | 
			
		||||
[2]: http://help.bombich.com/kb/overview/credits#opensource
 | 
			
		||||
[3]: https://github.com/sorin-ionescu/prezto/issues
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -28,3 +28,4 @@ alias rsync-update="${_rsync_cmd} --update"
 | 
			
		||||
alias rsync-synchronize="${_rsync_cmd} --update --delete"
 | 
			
		||||
 | 
			
		||||
unset _rsync_cmd
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -16,3 +16,4 @@ while [[ "$root_dir" != '/' ]]; do
 | 
			
		||||
done
 | 
			
		||||
 | 
			
		||||
return 1
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -28,3 +28,4 @@ if [[ -n "$version" ]]; then
 | 
			
		||||
  zformat -f version_formatted "$version_format" "v:$version"
 | 
			
		||||
  ruby_info[version]="$version_formatted"
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -63,3 +63,4 @@ if (( $+commands[bundle] )); then
 | 
			
		||||
    && print vendor/bundle >>! .gitignore \
 | 
			
		||||
    && print vendor/cache  >>! .gitignore'
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -38,3 +38,4 @@ Authors
 | 
			
		||||
 | 
			
		||||
[1]: http://www.gnu.org/software/screen/
 | 
			
		||||
[2]: https://github.com/sorin-ionescu/prezto/issues
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -40,3 +40,4 @@ alias scr='screen'
 | 
			
		||||
alias scrl='screen -list'
 | 
			
		||||
alias scrn='screen -U -S'
 | 
			
		||||
alias scrr='screen -a -A -U -D -R'
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -89,3 +89,4 @@ Authors
 | 
			
		||||
 | 
			
		||||
[1]: http://lucentbeing.com/writing/archives/a-guide-to-256-color-codes/
 | 
			
		||||
[2]: https://github.com/sorin-ionescu/prezto/issues
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -67,3 +67,4 @@ for color in {0..255}; do
 | 
			
		||||
  BG[$color]="\e[48;5;${color}m"
 | 
			
		||||
done
 | 
			
		||||
unset color{s,} index
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user