X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=42de4c47e660d8d613f46bb784d7fce772e6c51c;hb=4d645bc030f904b4b7ca830dcb4e10851adb45ac;hp=f50d1bce1a89e21a629506f7ce4c71bfa464ddb2;hpb=c14f4f9ccc191fd15575a0fd093b06bc125fc9fd;p=grml-etc-core.git diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc index f50d1bc..42de4c4 100644 --- a/etc/zsh/zshrc +++ b/etc/zsh/zshrc @@ -194,7 +194,7 @@ xcat() { # setup files. This should be called at the end of .zshrc. xunfunction() { local -a funcs - funcs=(check_com salias xcat xsource xunfunction) + funcs=(check_com salias xcat xsource xunfunction zrcautoload) for func in $funcs ; do [[ -n ${functions[$func]} ]] \ @@ -202,6 +202,28 @@ xunfunction() { done return 0 } + +# autoload wrapper - use this one instead of autoload directly +function zrcautoload() { + setopt local_options extended_glob + local fdir ffile + local -i ffound + + ffile=${1} + (( found = 0 )) + for fdir in ${fpath} ; do + [[ -e ${fdir}/${ffile} ]] && (( ffound = 1 )) + done + + (( ffound == 0 )) && return 1 + if [[ $ZSH_VERSION == 3.1.<6-> || $ZSH_VERSION == <4->* ]] ; then + autoload -U ${ffile} || return 1 + else + autoload ${ffile} || return 1 + fi + return 0 +} + #}}} # locale setup {{{ @@ -247,20 +269,25 @@ unset xof # {{{ check for version/system # check for versions (compatibility reasons) -if autoload is-at-least && is-at-least 2>/dev/null ; then - is4() { is-at-least 4 } - is41() { is-at-least 4.1 } - is42() { is-at-least 4.2 } -else - is4(){ - [[ $ZSH_VERSION == 4.* ]] && return 0 - return 1 - } - is42(){ - [[ $ZSH_VERSION == 4.<2->* ]] && return 0 - return 1 - } -fi +is4(){ + [[ $ZSH_VERSION == <4->* ]] && return 0 + return 1 +} + +is41(){ + [[ $ZSH_VERSION == 4.<1->* || $ZSH_VERSION == <5->* ]] && return 0 + return 1 +} + +is42(){ + [[ $ZSH_VERSION == 4.<2->* || $ZSH_VERSION == <5->* ]] && return 0 + return 1 +} + +is43(){ + [[ $ZSH_VERSION == 4.<3->* || $ZSH_VERSION == <5->* ]] && return 0 + return 1 +} #f1# Checks whether or not you're running grml isgrml(){ @@ -304,17 +331,47 @@ isgrml && checkhome() { cd fi } + +# check for zsh v3.1.7+ + +if ! [[ ${ZSH_VERSION} == 3.1.<7->* \ + || ${ZSH_VERSION} == 3.<2->.<->* \ + || ${ZSH_VERSION} == <4->.<->* ]] ; then + + printf '-!-\n' + printf '-!- In this configuration we try to make use of features, that only\n' + printf '-!- require version 3.1.7 of the shell; That way this setup can be\n' + printf '-!- used with a wide range of zsh versions, while using fairly\n' + printf '-!- advanced features in all supported versions.\n' + printf '-!-\n' + printf '-!- However, you are running zsh version %s.\n' "$ZSH_VERSION" + printf '-!-\n' + printf '-!- While this *may* work, it might as well fail.\n' + printf '-!- Please consider updating to at least version 3.1.7 of zsh.\n' + printf '-!-\n' + printf '-!- DO NOT EXPECT THIS TO WORK FLAWLESSLY!\n' + printf '-!- If it does today, you'\''ve been lucky.\n' + printf '-!-\n' + printf '-!- Ye been warned!\n' + printf '-!-\n' + + function zstyle() { : } +fi + # }}} # {{{ set some variables -#v# if check_com -c vim ; then +#v# export EDITOR=${EDITOR:-vim} else export EDITOR=${EDITOR:-vi} fi + #v# +(( ${+PAGER} )) || export PAGER="less" +#v# export MAIL=${MAIL:-/var/mail/$USER} # if we don't set $SHELL then aterm, rxvt,.. will use /bin/sh or /bin/bash :-/ @@ -335,11 +392,11 @@ check_com -c dircolors && eval $(dircolors -b) if [[ -n "$BROKEN_COMPLETION_DIR" ]] ; then print 'Warning: not setting completion directories because broken files have been found.' >&2 else - [[ -d /etc/zsh/completion.d ]] && fpath+=( /etc/zsh/completion.d ) + [[ -d /etc/zsh/completion.d ]] && fpath=( $fpath /etc/zsh/completion.d ) if [[ -d /etc/zsh/functions.d ]] ; then fpath+=( /etc/zsh/functions.d ) for func in /etc/zsh/functions.d/[^_]*[^~] ; do - autoload -U ${func:t} + zrcautoload -U ${func:t} done fi fi @@ -395,7 +452,7 @@ bindkey '\e[8~' end-of-line # end # insert unicode character # usage example: 'ctrl-x i' 00A7 'ctrl-x i' will give you an ยง # See for example http://unicode.org/charts/ for unicode characters code -autoload insert-unicode-char +zrcautoload insert-unicode-char zle -N insert-unicode-char #k# Insert Unicode character bindkey '^Xi' insert-unicode-char @@ -414,6 +471,148 @@ bindkey '^Xi' insert-unicode-char # bindkey '\eq' push-line-or-edit # }}} +# a generic accept-line wrapper {{{ + +# This widget can prevent unwanted autocorrections from command-name +# to _command-name, rehash automatically on enter and call any number +# of builtin and user-defined widgets in different contexts. +# +# For a broader description, see: +# +# +# The code is imported from the file 'zsh/functions/accept-line' from +# , which +# distributed under the same terms as zsh itself. + +# A newly added command will may not be found or will cause false +# correction attempts, if you got auto-correction set. By setting the +# following style, we force accept-line() to rehash, if it cannot +# find the first word on the command line in the $command[] hash. +zstyle ':acceptline:*' rehash true + +function Accept-Line() { + setopt localoptions noksharrays + local -a subs + local -xi aldone + local sub + + zstyle -a ":acceptline:${alcontext}" actions subs + + (( ${#subs} < 1 )) && return 0 + + (( aldone = 0 )) + for sub in ${subs} ; do + [[ ${sub} == 'accept-line' ]] && sub='.accept-line' + zle ${sub} + + (( aldone > 0 )) && break + done +} + +function Accept-Line-getdefault() { + local default_action + + zstyle -s ":acceptline:${alcontext}" default_action default_action + case ${default_action} in + ((accept-line|)) + printf ".accept-line" + ;; + (*) + printf ${default_action} + ;; + esac +} + +function accept-line() { + setopt localoptions noksharrays + local -a cmdline + local -x alcontext + local buf com fname format msg default_action + + alcontext='default' + buf="${BUFFER}" + cmdline=(${(z)BUFFER}) + com="${cmdline[1]}" + fname="_${com}" + + zstyle -t ":acceptline:${alcontext}" rehash \ + && [[ -z ${commands[$com]} ]] \ + && rehash + + if [[ -n ${reswords[(r)$com]} ]] \ + || [[ -n ${aliases[$com]} ]] \ + || [[ -n ${functions[$com]} ]] \ + || [[ -n ${builtins[$com]} ]] \ + || [[ -n ${commands[$com]} ]] ; then + + # there is something sensible to execute, just do it. + alcontext='normal' + zle Accept-Line + + default_action=$(Accept-Line-getdefault) + zstyle -T ":acceptline:${alcontext}" call_default \ + && zle ${default_action} + return + fi + + if [[ -o correct ]] \ + || [[ -o correctall ]] \ + && [[ -n ${functions[$fname]} ]] ; then + + # nothing there to execute but there is a function called + # _command_name; a completion widget. Makes no sense to + # call it on the commandline, but the correct{,all} options + # will ask for it nevertheless, so warn the user. + if [[ ${LASTWIDGET} == 'accept-line' ]] ; then + # Okay, we warned the user before, he called us again, + # so have it his way. + alcontext='force' + zle Accept-Line + + default_action=$(Accept-Line-getdefault) + zstyle -T ":acceptline:${alcontext}" call_default \ + && zle ${default_action} + return + fi + + # prepare warning message for the user, configurable via zstyle. + zstyle -s ":acceptline:${alcontext}" compwarnfmt msg + + if [[ -z ${msg} ]] ; then + msg="%c will not execute and completion %f exists." + fi + + zformat -f msg "${msg}" "c:${com}" "f:${fname}" + + zle -M -- "${msg}" + return + elif [[ -n ${buf//[$' \t\n']##/} ]] ; then + # If we are here, the commandline contains something that is not + # executable, which is neither subject to _command_name correction + # and is not empty. might be a variable assignment + alcontext='misc' + zle Accept-Line + + default_action=$(Accept-Line-getdefault) + zstyle -T ":acceptline:${alcontext}" call_default \ + && zle ${default_action} + return + fi + + # If we got this far, the commandline only contains whitespace, or is empty. + alcontext='empty' + zle Accept-Line + + default_action=$(Accept-Line-getdefault) + zstyle -T ":acceptline:${alcontext}" call_default \ + && zle ${default_action} +} + +zle -N accept-line +zle -N Accept-Line + +# }}} + # power completion - abbreviation expansion {{{ # power completion / abbreviation expansion / buffer expansion # see http://zshwiki.org/home/examples/zleiab for details @@ -507,8 +706,8 @@ bindkey ",." globalias # }}} # {{{ autoloading -autoload -U zmv # who needs mmv or rename? -autoload history-search-end +zrcautoload zmv # who needs mmv or rename? +zrcautoload history-search-end # we don't want to quote/espace URLs on our own... # if autoload -U url-quote-magic ; then @@ -521,10 +720,10 @@ alias url-quote='autoload -U url-quote-magic ; zle -N self-insert url-quote-magi #m# k ESC-h Call \kbd{run-help} for the 1st word on the command line alias run-help >&/dev/null && unalias run-help -autoload run-help # use via 'esc-h' +zrcautoload run-help # use via 'esc-h' # completion system -if autoload -U compinit && compinit 2>/dev/null ; then +if zrcautoload compinit && compinit 2>/dev/null ; then compinit 2>/dev/null || print 'Notice: no compinit available :(' else print 'Notice: no compinit available :(' @@ -532,7 +731,7 @@ else function compdef { } fi -is4 && autoload -U zed # use ZLE editor to edit a file or function +is4 && zrcautoload zed # use ZLE editor to edit a file or function is4 && \ for mod in complist deltochar mathfunc ; do @@ -555,7 +754,7 @@ if is4 ; then unset tmpargs fi -if is4 && autoload -U insert-files && zle -N insert-files ; then +if is4 && zrcautoload insert-files && zle -N insert-files ; then #k# Insert files bindkey "^Xf" insert-files # C-x-f fi @@ -565,7 +764,7 @@ bindkey ' ' magic-space # also do history expansion on space bindkey '\ei' menu-complete # menu completion via esc-i # press esc-e for editing command line in $EDITOR or $VISUAL -if is4 && autoload -U edit-command-line && zle -N edit-command-line ; then +if is4 && zrcautoload edit-command-line && zle -N edit-command-line ; then #k# Edit the current line in \kbd{\$EDITOR} bindkey '\ee' edit-command-line fi @@ -601,7 +800,7 @@ zle -N insert-last-typed-word; bindkey "\em" insert-last-typed-word # set command prediction from history, see 'man 1 zshcontrib' -# is4 && autoload -U predict-on && \ +# is4 && zrcautoload predict-on && \ # zle -N predict-on && \ # zle -N predict-off && \ # bindkey "^X^Z" predict-on && \ @@ -672,6 +871,7 @@ setopt extended_glob # in order to use #, ~ and ^ for filename generation # grep word *~(*.gz|*.bz|*.bz2|*.zip|*.Z) -> # -> searches for word not in compressed files # don't forget to quote '^', '~' and '#'! +setopt longlistjobs # display PID when suspending processes as well setopt notify # report the status of backgrounds jobs immediately setopt hash_list_all # Whenever a command completion is attempted, make sure \ # the entire command path is hashed first. @@ -729,7 +929,7 @@ if [[ -f ~/.zdirs ]] && [[ ${#dirstack[*]} -eq 0 ]] ; then fi chpwd() { - builtin dirs -pl >! ~/.zdirs + builtin print -l ${(u)dirstack} >! ~/.zdirs } # }}} @@ -813,7 +1013,7 @@ __vcs_dir() { # }}} # {{{ set prompt -if autoload promptinit && promptinit 2>/dev/null ; then +if zrcautoload promptinit && promptinit 2>/dev/null ; then promptinit # people should be able to use their favourite prompt else print 'Notice: no promptinit available :(' @@ -863,7 +1063,7 @@ is4 && [[ -z $NOPRECMD ]] && \ preexec () { [[ -n $NOPRECMD ]] && return 0 # set hostname if not running on host with name 'grml' - if [[ "$HOSTNAME" != $(hostname) ]] ; then + if [[ -n "$HOSTNAME" ]] && [[ "$HOSTNAME" != $(hostname) ]] ; then NAME="@$HOSTNAME" fi # get the name of the program currently running and hostname of local machine @@ -888,7 +1088,7 @@ preexec () { } # set colors -if autoload colors && colors 2>/dev/null ; then +if zrcautoload colors && colors 2>/dev/null ; then BLUE="%{${fg[blue]}%}" RED="%{${fg_bold[red]}%}" GREEN="%{${fg[green]}%}" @@ -1214,7 +1414,7 @@ fi # {{{ Use hard limits, except for a smaller stack and no core dumps unlimit -limit stack 8192 +is4 && limit stack 8192 isgrmlcd && limit core 0 # important for a live-cd-system limit -s # }}} @@ -1338,18 +1538,6 @@ grmlcomp() { # zstyle ':completion:*' completer _complete _correct _approximate # zstyle ':completion:*' expand prefix suffix - # automatic rehash? Credits go to Frank Terbeck - # TODO: keep this at all? And if so, move it, it has nothing to do with completion - # my_accept() { - # local buf - # [[ -z ${BUFFER} ]] && zle accept-line && return - # buf=( ${(z)BUFFER} ) - # [[ -z ${commands[${buf[1]}]} ]] && rehash - # zle accept-line - # } - # zle -N my_accept - # bindkey "^M" my_accept - # command for process lists, the local web server details and host completion zstyle ':completion:*:urls' local 'www' '/var/www/' 'public_html' @@ -1520,13 +1708,13 @@ else # manzsh() { man zshall | $MYLESS -p $1 ; } fi -if check_com -c most ; then +if check_com -c $PAGER ; then #f1# View Debian's changelog of a given package dchange() { if [[ -r /usr/share/doc/${1}/changelog.Debian.gz ]] ; then - most /usr/share/doc/${1}/changelog.Debian.gz + $PAGER /usr/share/doc/${1}/changelog.Debian.gz elif [[ -r /usr/share/doc/${1}/changelog.gz ]] ; then - most /usr/share/doc/${1}/changelog.gz + $PAGER /usr/share/doc/${1}/changelog.gz else if check_com -c aptitude ; then echo "No changelog for package $1 found, using aptitude to retrieve it." @@ -1547,10 +1735,10 @@ if check_com -c most ; then #f1# View Debian's NEWS of a given package dnews() { if [[ -r /usr/share/doc/${1}/NEWS.Debian.gz ]] ; then - most /usr/share/doc/${1}/NEWS.Debian.gz + $PAGER /usr/share/doc/${1}/NEWS.Debian.gz else if [[ -r /usr/share/doc/${1}/NEWS.gz ]] ; then - most /usr/share/doc/${1}/NEWS.gz + $PAGER /usr/share/doc/${1}/NEWS.gz else echo "No NEWS file for package $1 found, sorry." return 1 @@ -1563,7 +1751,7 @@ if check_com -c most ; then #f1# View upstream's changelog of a given package uchange() { if [[ -r /usr/share/doc/${1}/changelog.gz ]] ; then - most /usr/share/doc/${1}/changelog.gz + $PAGER /usr/share/doc/${1}/changelog.gz else echo "No changelog for package $1 found, sorry." return 1