mirror of
https://github.com/dcarrillo/prezto.git
synced 2025-07-01 20:59:26 +00:00
Compare commits
14 Commits
issue/231-
...
pull/552-g
Author | SHA1 | Date | |
---|---|---|---|
36e24eeb08 | |||
af003d83c5 | |||
839f4a7b83 | |||
c091f71283 | |||
e1974ad58d | |||
391bc405d0 | |||
80ded5e33d | |||
fa6723a5ee | |||
57b283facd | |||
aefdce3fc3 | |||
e4e4f89c9f | |||
817dd3aa3a | |||
347928193f | |||
da1a837cd4 |
@ -9,8 +9,7 @@ Installation
|
|||||||
------------
|
------------
|
||||||
|
|
||||||
Prezto will work with any recent release of Zsh, but the minimum recommended
|
Prezto will work with any recent release of Zsh, but the minimum recommended
|
||||||
version is 4.3.11. Unfortunately, [Cygwin][9] is not supported due to
|
version is 4.3.11.
|
||||||
non-standard core utilities.
|
|
||||||
|
|
||||||
1. Launch Zsh:
|
1. Launch Zsh:
|
||||||
|
|
||||||
@ -37,7 +36,7 @@ non-standard core utilities.
|
|||||||
### Troubleshooting
|
### Troubleshooting
|
||||||
|
|
||||||
If you are not able to find certain commands after switching to *Prezto*,
|
If you are not able to find certain commands after switching to *Prezto*,
|
||||||
modify the `PATH` variable in *~/.zshenv* then open a new Zsh terminal
|
modify the `PATH` variable in *~/.zprofile* then open a new Zsh terminal
|
||||||
window or tab.
|
window or tab.
|
||||||
|
|
||||||
Updating
|
Updating
|
||||||
@ -86,7 +85,8 @@ License
|
|||||||
|
|
||||||
(The MIT License)
|
(The MIT License)
|
||||||
|
|
||||||
Copyright (c) 2009-2014 Sorin Ionescu and contributors.
|
Copyright (c) 2009-2011 Robby Russell and contributors.
|
||||||
|
Copyright (c) 2011-2014 Sorin Ionescu and contributors.
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||||
this software and associated documentation files (the "Software"), to deal in
|
this software and associated documentation files (the "Software"), to deal in
|
||||||
@ -114,5 +114,4 @@ SOFTWARE.
|
|||||||
[6]: http://gitref.org
|
[6]: http://gitref.org
|
||||||
[7]: http://www.bash2zsh.com/zsh_refcard/refcard.pdf
|
[7]: http://www.bash2zsh.com/zsh_refcard/refcard.pdf
|
||||||
[8]: http://grml.org/zsh/zsh-lovers.html
|
[8]: http://grml.org/zsh/zsh-lovers.html
|
||||||
[9]: http://www.cygwin.com
|
|
||||||
|
|
||||||
|
2
init.zsh
2
init.zsh
@ -25,7 +25,7 @@ unset min_zsh_version
|
|||||||
function pmodload {
|
function pmodload {
|
||||||
local -a pmodules
|
local -a pmodules
|
||||||
local pmodule
|
local pmodule
|
||||||
local pfunction_glob='^([_.]*|prompt_*_setup|README*)(.N:t)'
|
local pfunction_glob='^([_.]*|prompt_*_setup|README*)(-.N:t)'
|
||||||
|
|
||||||
# $argv is overridden in the anonymous function.
|
# $argv is overridden in the anonymous function.
|
||||||
pmodules=("$argv[@]")
|
pmodules=("$argv[@]")
|
||||||
|
@ -107,31 +107,40 @@ function editor-info {
|
|||||||
}
|
}
|
||||||
zle -N editor-info
|
zle -N editor-info
|
||||||
|
|
||||||
# Ensures that $terminfo values are valid and updates editor information when
|
# Updates editor information when the keymap changes.
|
||||||
# the keymap changes.
|
function zle-keymap-select {
|
||||||
function zle-keymap-select zle-line-init zle-line-finish {
|
zle editor-info
|
||||||
|
}
|
||||||
|
zle -N zle-keymap-select
|
||||||
|
|
||||||
|
# Enables terminal application mode and updates editor information.
|
||||||
|
function zle-line-init {
|
||||||
# The terminal must be in application mode when ZLE is active for $terminfo
|
# The terminal must be in application mode when ZLE is active for $terminfo
|
||||||
# values to be valid.
|
# values to be valid.
|
||||||
if (( $+terminfo[smkx] && $+terminfo[rmkx] )); then
|
if (( $+terminfo[smkx] )); then
|
||||||
case "$0" in
|
# Enable terminal application mode.
|
||||||
(zle-line-init)
|
echoti smkx
|
||||||
# Enable terminal application mode.
|
|
||||||
echoti smkx
|
|
||||||
;;
|
|
||||||
(zle-line-finish)
|
|
||||||
# Disable terminal application mode.
|
|
||||||
echoti rmkx
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Update editor information.
|
# Update editor information.
|
||||||
zle editor-info
|
zle editor-info
|
||||||
}
|
}
|
||||||
zle -N zle-keymap-select
|
|
||||||
zle -N zle-line-finish
|
|
||||||
zle -N zle-line-init
|
zle -N zle-line-init
|
||||||
|
|
||||||
|
# Disables terminal application mode and updates editor information.
|
||||||
|
function zle-line-finish {
|
||||||
|
# The terminal must be in application mode when ZLE is active for $terminfo
|
||||||
|
# values to be valid.
|
||||||
|
if (( $+terminfo[rmkx] )); then
|
||||||
|
# Disable terminal application mode.
|
||||||
|
echoti rmkx
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Update editor information.
|
||||||
|
zle editor-info
|
||||||
|
}
|
||||||
|
zle -N zle-line-finish
|
||||||
|
|
||||||
# Toggles emacs overwrite mode and updates editor information.
|
# Toggles emacs overwrite mode and updates editor information.
|
||||||
function overwrite-mode {
|
function overwrite-mode {
|
||||||
zle .overwrite-mode
|
zle .overwrite-mode
|
||||||
|
@ -5,8 +5,11 @@
|
|||||||
# Completes git-hub-shorten-url.
|
# Completes git-hub-shorten-url.
|
||||||
#
|
#
|
||||||
# Authors:
|
# Authors:
|
||||||
|
# Joel Kuzmarski <leoj3n@gmail.com>
|
||||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||||
#
|
#
|
||||||
|
|
||||||
_arguments '1:url:' && return 0
|
_arguments \
|
||||||
|
'1:url:' \
|
||||||
|
'2:slug:' && return 0
|
||||||
|
|
||||||
|
@ -2,21 +2,29 @@
|
|||||||
# Shortens GitHub URLs.
|
# Shortens GitHub URLs.
|
||||||
#
|
#
|
||||||
# Authors:
|
# Authors:
|
||||||
|
# Joel Kuzmarski <leoj3n@gmail.com>
|
||||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||||
#
|
#
|
||||||
|
|
||||||
local url="$1"
|
local url="$1"
|
||||||
|
|
||||||
if [[ "$url" == '-' ]]; then
|
|
||||||
read url <&0
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ -z "$url" ]]; then
|
if [[ -z "$url" ]]; then
|
||||||
print "usage: $0 [ url | - ]" >&2
|
print "usage: $0 [ url | - ] [slug]" >&2
|
||||||
|
return 1
|
||||||
|
elif [[ "$url" == '-' ]]; then
|
||||||
|
read url <&0
|
||||||
|
elif [[ "$url" != *github.com* ]]; then
|
||||||
|
url="https://github.com/$url"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if (( $+commands[curl] )); then
|
if (( $+commands[curl] )); then
|
||||||
curl -s -i 'http://git.io' -F "url=$url" | grep 'Location:' | sed 's/Location: //'
|
local result="$(curl -s -i 'http://git.io' -F "url=$url" -F "code=$2")"
|
||||||
|
|
||||||
|
if [[ $result == *Unprocessable* ]]; then
|
||||||
|
print "$0: the slug '$2' is already taken!" >&2
|
||||||
|
else
|
||||||
|
print $result | grep 'Location:' | sed 's/Location: //'
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
print "$0: command not found: curl" >&2
|
print "$0: command not found: curl" >&2
|
||||||
fi
|
fi
|
||||||
|
@ -12,7 +12,7 @@ fi
|
|||||||
|
|
||||||
# Set the default paths to gpg-agent files.
|
# Set the default paths to gpg-agent files.
|
||||||
_gpg_agent_conf="$HOME/.gnupg/gpg-agent.conf"
|
_gpg_agent_conf="$HOME/.gnupg/gpg-agent.conf"
|
||||||
_gpg_agent_env="$TMPDIR/gpg-agent.env"
|
_gpg_agent_env="${TMPDIR:-/tmp}/gpg-agent.env"
|
||||||
|
|
||||||
# Start gpg-agent if not started.
|
# Start gpg-agent if not started.
|
||||||
if ! ps -U "$USER" -o ucomm | grep -q gpg-agent; then
|
if ! ps -U "$USER" -o ucomm | grep -q gpg-agent; then
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
# Sorin Ionescu <sorin.ionescu@gmail.com>
|
||||||
#
|
#
|
||||||
|
|
||||||
local tmp="$TMPDIR/pacman-disowned-$UID-$$"
|
local tmp="${TMPDIR:-/tmp}/pacman-disowned-$UID-$$"
|
||||||
local db="$tmp/db"
|
local db="$tmp/db"
|
||||||
local fs="$tmp/fs"
|
local fs="$tmp/fs"
|
||||||
|
|
||||||
|
@ -27,6 +27,9 @@ if (( $+commands[$_pacman_frontend] )); then
|
|||||||
if [[ -s "${0:h}/${_pacman_frontend}.zsh" ]]; then
|
if [[ -s "${0:h}/${_pacman_frontend}.zsh" ]]; then
|
||||||
source "${0:h}/${_pacman_frontend}.zsh"
|
source "${0:h}/${_pacman_frontend}.zsh"
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
_pacman_frontend='pacman'
|
||||||
|
_pacman_sudo='sudo '
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#
|
#
|
||||||
@ -34,49 +37,49 @@ fi
|
|||||||
#
|
#
|
||||||
|
|
||||||
# Pacman.
|
# Pacman.
|
||||||
alias pac='pacman'
|
alias pac="${_pacman_frontend}"
|
||||||
|
|
||||||
# Installs packages from repositories.
|
# Installs packages from repositories.
|
||||||
alias paci='sudo pacman --sync'
|
alias paci="${_pacman_sudo}${_pacman_frontend} --sync"
|
||||||
|
|
||||||
# Installs packages from files.
|
# Installs packages from files.
|
||||||
alias pacI='sudo pacman --upgrade'
|
alias pacI="${_pacman_sudo}${_pacman_frontend} --upgrade"
|
||||||
|
|
||||||
# Removes packages and unneeded dependencies.
|
# Removes packages and unneeded dependencies.
|
||||||
alias pacx='sudo pacman --remove'
|
alias pacx="${_pacman_sudo}${_pacman_frontend} --remove"
|
||||||
|
|
||||||
# Removes packages, their configuration, and unneeded dependencies.
|
# Removes packages, their configuration, and unneeded dependencies.
|
||||||
alias pacX='sudo pacman --remove --nosave --recursive'
|
alias pacX="${_pacman_sudo}${_pacman_frontend} --remove --nosave --recursive"
|
||||||
|
|
||||||
# Displays information about a package from the repositories.
|
# Displays information about a package from the repositories.
|
||||||
alias pacq='pacman --sync --info'
|
alias pacq="${_pacman_frontend} --sync --info"
|
||||||
|
|
||||||
# Displays information about a package from the local database.
|
# Displays information about a package from the local database.
|
||||||
alias pacQ='pacman --query --info'
|
alias pacQ="${_pacman_frontend} --query --info"
|
||||||
|
|
||||||
# Searches for packages in the repositories.
|
# Searches for packages in the repositories.
|
||||||
alias pacs='pacman --sync --search'
|
alias pacs="${_pacman_frontend} --sync --search"
|
||||||
|
|
||||||
# Searches for packages in the local database.
|
# Searches for packages in the local database.
|
||||||
alias pacS='pacman --query --search'
|
alias pacS="${_pacman_frontend} --query --search"
|
||||||
|
|
||||||
# Lists orphan packages.
|
# Lists orphan packages.
|
||||||
alias pacman-list-orphans='sudo pacman --query --deps --unrequired'
|
alias pacman-list-orphans="${_pacman_sudo}${_pacman_frontend} --query --deps --unrequired"
|
||||||
|
|
||||||
# Removes orphan packages.
|
# Removes orphan packages.
|
||||||
alias pacman-remove-orphans='sudo pacman --remove --recursive $(pacman --quiet --query --deps --unrequired)'
|
alias pacman-remove-orphans="${_pacman_sudo}${_pacman_frontend} --remove --recursive \$(${_pacman_frontend} --quiet --query --deps --unrequired)"
|
||||||
|
|
||||||
# Synchronizes the local package and Arch Build System databases against the
|
# Synchronizes the local package and Arch Build System databases against the
|
||||||
# repositories.
|
# repositories.
|
||||||
if (( $+commands[abs] )); then
|
if (( $+commands[abs] )); then
|
||||||
alias pacu='sudo pacman --sync --refresh && sudo abs'
|
alias pacu="${_pacman_sudo}${_pacman_frontend} --sync --refresh && ${_pacman_sudo}abs"
|
||||||
else
|
else
|
||||||
alias pacu='sudo pacman --sync --refresh'
|
alias pacu="${_pacman_sudo}${_pacman_frontend} --sync --refresh"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Synchronizes the local package database against the repositories then
|
# Synchronizes the local package database against the repositories then
|
||||||
# upgrades outdated packages.
|
# upgrades outdated packages.
|
||||||
alias pacU='sudo pacman --sync --refresh --sysupgrade'
|
alias pacU="${_pacman_sudo}${_pacman_frontend} --sync --refresh --sysupgrade"
|
||||||
|
|
||||||
unset _pacman_frontend
|
unset _pacman_{frontend,sudo}
|
||||||
|
|
||||||
|
@ -11,9 +11,9 @@
|
|||||||
|
|
||||||
# Disable color.
|
# Disable color.
|
||||||
if ! zstyle -t ':prezto:module:pacman:yaourt' color; then
|
if ! zstyle -t ':prezto:module:pacman:yaourt' color; then
|
||||||
alias pacman='pacman --nocolor'
|
alias pacman='yaourt --nocolor'
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Manages .pac* files.
|
# Manages .pac* files.
|
||||||
alias pacc='pacman -C'
|
alias pacc='yaourt -C'
|
||||||
|
|
||||||
|
@ -43,14 +43,14 @@ alias rb='ruby'
|
|||||||
# Bundler
|
# Bundler
|
||||||
if (( $+commands[bundle] )); then
|
if (( $+commands[bundle] )); then
|
||||||
alias rbb='bundle'
|
alias rbb='bundle'
|
||||||
alias rbbe='rbb exec'
|
alias rbbe='bundle exec'
|
||||||
alias rbbi='rbb install'
|
alias rbbi='bundle install --path vendor/bundle'
|
||||||
alias rbbl='rbb list'
|
alias rbbl='bundle list'
|
||||||
alias rbbo='rbb open'
|
alias rbbo='bundle open'
|
||||||
alias rbbp='rbb package'
|
alias rbbp='bundle package'
|
||||||
alias rbbu='rbb update'
|
alias rbbu='bundle update'
|
||||||
alias rbbI='rbbi \
|
alias rbbI='rbbi \
|
||||||
&& rbb package \
|
&& bundle package \
|
||||||
&& print .bundle >>! .gitignore \
|
&& print .bundle >>! .gitignore \
|
||||||
&& print vendor/assets >>! .gitignore \
|
&& print vendor/assets >>! .gitignore \
|
||||||
&& print vendor/bundle >>! .gitignore \
|
&& print vendor/bundle >>! .gitignore \
|
||||||
|
@ -14,10 +14,10 @@ fi
|
|||||||
_ssh_dir="$HOME/.ssh"
|
_ssh_dir="$HOME/.ssh"
|
||||||
|
|
||||||
# Set the path to the environment file if not set by another module.
|
# Set the path to the environment file if not set by another module.
|
||||||
_ssh_agent_env="${_ssh_agent_env:-$TMPDIR/ssh-agent.env}"
|
_ssh_agent_env="${_ssh_agent_env:-${TMPDIR:-/tmp}/ssh-agent.env}"
|
||||||
|
|
||||||
# Set the path to the persistent authentication socket.
|
# Set the path to the persistent authentication socket.
|
||||||
_ssh_agent_sock="$TMPDIR/ssh-agent.sock"
|
_ssh_agent_sock="${TMPDIR:-/tmp}/ssh-agent.sock"
|
||||||
|
|
||||||
# Start ssh-agent if not started.
|
# Start ssh-agent if not started.
|
||||||
if [[ ! -S "$SSH_AUTH_SOCK" ]]; then
|
if [[ ! -S "$SSH_AUTH_SOCK" ]]; then
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
# Return if requirements are not found.
|
# Return if requirements are not found.
|
||||||
if [[ "$TERM" == 'dumb' ]]; then
|
if [[ "$TERM" == (dumb|linux|*bsd*) ]]; then
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -104,6 +104,10 @@ alias sl='ls' # I often screw this up.
|
|||||||
# Mac OS X Everywhere
|
# Mac OS X Everywhere
|
||||||
if [[ "$OSTYPE" == darwin* ]]; then
|
if [[ "$OSTYPE" == darwin* ]]; then
|
||||||
alias o='open'
|
alias o='open'
|
||||||
|
elif [[ "$OSTYPE" == cygwin* ]]; then
|
||||||
|
alias o='cygstart'
|
||||||
|
alias pbcopy='tee > /dev/clipboard'
|
||||||
|
alias pbpaste='cat /dev/clipboard'
|
||||||
else
|
else
|
||||||
alias o='xdg-open'
|
alias o='xdg-open'
|
||||||
|
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
# Ensure that a non-login, non-interactive shell has a defined environment.
|
# Ensure that a non-login, non-interactive shell has a defined environment.
|
||||||
if [[ "$SHLVL" -eq 1 && ! -o LOGIN ]]; then
|
if [[ "$SHLVL" -eq 1 && ! -o LOGIN && -s "${ZDOTDIR:-$HOME}/.zprofile" ]]; then
|
||||||
source "${ZDOTDIR:-$HOME}/.zprofile"
|
source "${ZDOTDIR:-$HOME}/.zprofile"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user