Merge branch 'fix-lighthouse-error-message' of https://github.com/mortice/oh-my-zsh into mortice-fix-lighthouse-error-message
This commit is contained in:
Robby Russell
commit
217f395c35
|
|
@ -34,9 +34,31 @@ zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm
|
||||||
zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
|
zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
|
||||||
cdpath=(.)
|
cdpath=(.)
|
||||||
|
|
||||||
|
# use /etc/hosts and known_hosts for hostname completion
|
||||||
|
[ -r ~/.ssh/known_hosts ] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=()
|
||||||
|
[ -r /etc/hosts ] && : ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} || _etc_hosts=()
|
||||||
|
hosts=(
|
||||||
|
"$_ssh_hosts[@]"
|
||||||
|
"$_etc_hosts[@]"
|
||||||
|
`hostname`
|
||||||
|
localhost
|
||||||
|
)
|
||||||
|
zstyle ':completion:*:hosts' hosts $hosts
|
||||||
|
|
||||||
|
# Use caching so that commands like apt and dpkg complete are useable
|
||||||
|
zstyle ':completion::complete:*' use-cache 1
|
||||||
|
zstyle ':completion::complete:*' cache-path ~/.oh-my-zsh/cache/
|
||||||
|
|
||||||
|
# Don't complete uninteresting users
|
||||||
|
zstyle ':completion:*:*:*:users' ignored-patterns \
|
||||||
|
adm amanda apache avahi beaglidx bin cacti canna clamav daemon \
|
||||||
|
dbus distcache dovecot fax ftp games gdm gkrellmd gopher \
|
||||||
|
hacluster haldaemon halt hsqldb ident junkbust ldap lp mail \
|
||||||
|
mailman mailnull mldonkey mysql nagios \
|
||||||
|
named netdump news nfsnobody nobody nscd ntp nut nx openvpn \
|
||||||
|
operator pcap postfix postgres privoxy pulse pvm quagga radvd \
|
||||||
|
rpc rpcuser rpm shutdown squid sshd sync uucp vcsa xfs
|
||||||
|
|
||||||
|
# ... unless we really want to.
|
||||||
|
zstyle '*' single-ignored show
|
||||||
|
|
||||||
# Load known hosts file for auto-completion with ssh and scp commands
|
|
||||||
if [ -f ~/.ssh/known_hosts ]; then
|
|
||||||
zstyle ':completion:*' hosts $( sed 's/[, ].*$//' $HOME/.ssh/known_hosts )
|
|
||||||
zstyle ':completion:*:*:(ssh|scp):*:*' hosts `sed 's/^\([^ ,]*\).*$/\1/' ~/.ssh/known_hosts`
|
|
||||||
fi
|
|
||||||
|
|
|
||||||
5
plugins/command-not-found/command-not-found.plugin.zsh
Normal file
5
plugins/command-not-found/command-not-found.plugin.zsh
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
# Uses the command-not-found package zsh support
|
||||||
|
# as seen in http://www.porcheron.info/command-not-found-for-zsh/
|
||||||
|
# this is installed in Ubuntu
|
||||||
|
|
||||||
|
source /etc/zsh_command_not_found
|
||||||
20
plugins/phing/phing.plugin.zsh
Normal file
20
plugins/phing/phing.plugin.zsh
Normal file
|
|
@ -0,0 +1,20 @@
|
||||||
|
_phing_does_target_list_need_generating () {
|
||||||
|
if [ ! -f .phing_targets ]; then return 0;
|
||||||
|
else
|
||||||
|
accurate=$(stat -f%m .phing_targets)
|
||||||
|
changed=$(stat -f%m build.xml)
|
||||||
|
return $(expr $accurate '>=' $changed)
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
_phing () {
|
||||||
|
if [ -f build.xml ]; then
|
||||||
|
if _phing_does_target_list_need_generating; then
|
||||||
|
echo "\nGenerating .phing_targets..." > /dev/stderr
|
||||||
|
phing -l |grep -v ":" |grep -v "^$"|grep -v "\-" > .phing_targets
|
||||||
|
fi
|
||||||
|
compadd `cat .phing_targets`
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
compdef _phing phing
|
||||||
104
plugins/vagrant/_vagrant
Normal file
104
plugins/vagrant/_vagrant
Normal file
|
|
@ -0,0 +1,104 @@
|
||||||
|
#compdef vagrant
|
||||||
|
#autoload
|
||||||
|
|
||||||
|
# vagrant zsh completion
|
||||||
|
|
||||||
|
local -a _1st_arguments
|
||||||
|
_1st_arguments=(
|
||||||
|
'box:Box commands'
|
||||||
|
'destroy:Destroys the vagrant environment'
|
||||||
|
'halt:Halts the currently running vagrant environment'
|
||||||
|
'help:[TASK] Describe available tasks or one specific task'
|
||||||
|
'init:[box_name] [box_url] Initializes current folder for Vagrant usage'
|
||||||
|
'package:Packages a vagrant environment for distribution'
|
||||||
|
'provision:Run the provisioner'
|
||||||
|
'reload:Reload the vagrant environment'
|
||||||
|
'resume:Resumes a suspend vagrant environment'
|
||||||
|
'ssh:SSH into the currently running environment'
|
||||||
|
'ssh_config:outputs .ssh/config valid syntax for connecting to this environment via ssh.'
|
||||||
|
'status:Shows the status of the current Vagrant environment.'
|
||||||
|
'suspend:Suspends the currently running vagrant environment'
|
||||||
|
'up:Creates the vagrant environment'
|
||||||
|
'version:Prints the Vagrant version information'
|
||||||
|
)
|
||||||
|
|
||||||
|
local -a _box_arguments
|
||||||
|
_box_arguments=(
|
||||||
|
'add:NAME URI Add a box to the system'
|
||||||
|
'help:COMMAND Describe subcommands or one specific subcommand'
|
||||||
|
'list:Lists all installed boxes'
|
||||||
|
'remove:NAME Remove a box from the system'
|
||||||
|
'repackage:NAME Repackage an installed box into a `.box` file.'
|
||||||
|
)
|
||||||
|
|
||||||
|
__task_list ()
|
||||||
|
{
|
||||||
|
local expl
|
||||||
|
declare -a tasks
|
||||||
|
|
||||||
|
tasks=(box destroy halt init package provision reload resume ssh ssh_config status suspend up version)
|
||||||
|
|
||||||
|
_wanted tasks expl 'help' compadd $tasks
|
||||||
|
}
|
||||||
|
|
||||||
|
__box_list ()
|
||||||
|
{
|
||||||
|
_wanted application expl 'command' compadd $(command ls -1 $HOME/.vagrant/boxes 2>/dev/null| sed -e 's/ /\\ /g')
|
||||||
|
}
|
||||||
|
|
||||||
|
__vagrant-box ()
|
||||||
|
{
|
||||||
|
local curcontext="$curcontext" state line
|
||||||
|
typeset -A opt_args
|
||||||
|
|
||||||
|
_arguments -C \
|
||||||
|
':command:->command' \
|
||||||
|
'*::options:->options'
|
||||||
|
|
||||||
|
case $state in
|
||||||
|
(command)
|
||||||
|
_describe -t commands "gem subcommand" _box_arguments
|
||||||
|
return
|
||||||
|
;;
|
||||||
|
|
||||||
|
(options)
|
||||||
|
case $line[1] in
|
||||||
|
(repackage|remove)
|
||||||
|
_arguments ':feature:__box_list'
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
local expl
|
||||||
|
local -a boxes installed_boxes
|
||||||
|
|
||||||
|
local curcontext="$curcontext" state line
|
||||||
|
typeset -A opt_args
|
||||||
|
|
||||||
|
_arguments -C \
|
||||||
|
':command:->command' \
|
||||||
|
'*::options:->options'
|
||||||
|
|
||||||
|
case $state in
|
||||||
|
(command)
|
||||||
|
_describe -t commands "gem subcommand" _1st_arguments
|
||||||
|
return
|
||||||
|
;;
|
||||||
|
|
||||||
|
(options)
|
||||||
|
case $line[1] in
|
||||||
|
(help)
|
||||||
|
_arguments ':feature:__task_list'
|
||||||
|
;;
|
||||||
|
|
||||||
|
(box)
|
||||||
|
__vagrant-box
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
esac
|
||||||
3
plugins/vagrant/vagrant.plugin.zsh
Normal file
3
plugins/vagrant/vagrant.plugin.zsh
Normal file
|
|
@ -0,0 +1,3 @@
|
||||||
|
fpath=($ZSH/plugins/vagrant $fpath)
|
||||||
|
autoload -U compinit
|
||||||
|
compinit -i
|
||||||
14
themes/bira.zsh-theme
Normal file
14
themes/bira.zsh-theme
Normal file
|
|
@ -0,0 +1,14 @@
|
||||||
|
# ZSH Theme - Preview: http://gyazo.com/8becc8a7ed5ab54a0262a470555c3eed.png
|
||||||
|
local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
|
||||||
|
|
||||||
|
local user_host='%{$terminfo[bold]$fg[green]%}%n@%m%{$reset_color%}'
|
||||||
|
local current_dir='%{$terminfo[bold]$fg[blue]%} %~%{$reset_color%}'
|
||||||
|
local rvm_ruby='%{$fg[red]%}‹$(~/.rvm/bin/rvm-prompt i v g)›%{$reset_color%}'
|
||||||
|
local git_branch='$(git_prompt_info)%{$reset_color%}'
|
||||||
|
|
||||||
|
PROMPT="╭─${user_host} ${current_dir} ${rvm_ruby} ${git_branch}
|
||||||
|
╰─%B$%b "
|
||||||
|
RPS1="${return_code}"
|
||||||
|
|
||||||
|
ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[yellow]%}‹"
|
||||||
|
ZSH_THEME_GIT_PROMPT_SUFFIX="› %{$reset_color%}"
|
||||||
Loading…
Reference in a new issue