diff options
author | gwjo <gowen72@gmail.com> | 2010-11-03 16:57:15 -0400 |
---|---|---|
committer | gwjo <gowen72@gmail.com> | 2010-11-03 16:57:15 -0400 |
commit | 9465ba0de456d270418457b486c308a2d49ed9c6 (patch) | |
tree | fe92f817f59496e375c2af2fc303b5cd485199cd /lib/completion.zsh | |
parent | dc12853b0c3e5af9e42f44cb9efdf57d44d20711 (diff) | |
download | zsh-9465ba0de456d270418457b486c308a2d49ed9c6.tar.gz zsh-9465ba0de456d270418457b486c308a2d49ed9c6.tar.bz2 zsh-9465ba0de456d270418457b486c308a2d49ed9c6.zip |
Completion fixes
Use /etc/hosts in addtion to $HOME/.ssh/known_hosts as the source for
hostname completion
Turn on completion caching to speed up certain comands
When completing usernames, don't include system accounts by default
Diffstat (limited to 'lib/completion.zsh')
-rw-r--r-- | lib/completion.zsh | 32 |
1 files changed, 27 insertions, 5 deletions
diff --git a/lib/completion.zsh b/lib/completion.zsh index 52cc5b53c..9c2dfecca 100644 --- a/lib/completion.zsh +++ b/lib/completion.zsh @@ -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 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 |