X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=ef2cced276ba9d7ccb36d801c1e47523549db585;hb=3c0d0ab61d47e9206deaf542d05abea1455ad0df;hp=2f2a85f29cee7b8c10d8c878e21401f84fe90072;hpb=cf749a8adf5146b970860b199a883e4344a15962;p=grml-etc-core.git diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc index 2f2a85f..ef2cced 100644 --- a/etc/zsh/zshrc +++ b/etc/zsh/zshrc @@ -230,6 +230,8 @@ zrcautoload is-at-least || is-at-least() { return 1 } NOCOR=${NOCOR:-0} NOMENU=${NOMENU:-0} NOPRECMD=${NOPRECMD:-0} +COMMAND_NOT_FOUND=${COMMAND_NOT_FOUND:-0} +GRML_ZSH_CNF_HANDLER=${GRML_ZSH_CNF_HANDLER:-/usr/share/command-not-found/command-not-found} BATTERY=${BATTERY:-0} GRMLSMALL_SPECIFIC=${GRMLSMALL_SPECIFIC:-1} GRML_ALWAYS_LOAD_ALL=${GRML_ALWAYS_LOAD_ALL:-0} @@ -443,12 +445,17 @@ xunfunction() { return 0 } +# this allows us to stay in sync with grml's zshrc and put own +# modifications in ~/.zshrc.local +zrclocal() { + xsource "${HOME}/.zshrc.local" + return 0 +} + #}}} # locale setup {{{ -if [[ -z "$LANG" ]] ; then - xsource "/etc/default/locale" -fi +xsource "/etc/default/locale" export LANG=${LANG:-en_US.iso885915} for var in LC_ALL LC_MESSAGES ; do @@ -623,6 +630,14 @@ grml_toggle_abbrev() { zle -N grml_toggle_abbrev bindkey '^xA' grml_toggle_abbrev +# add a command line to the shells history without executing it +commit-to-history() { + print -s ${(z)BUFFER} + zle send-break +} +zle -N commit-to-history +bindkey "^x^h" commit-to-history + # }}} # a generic accept-line wrapper {{{ @@ -776,26 +791,26 @@ declare -A abk setopt extendedglob setopt interactivecomments abk=( -# key # value (#d additional doc string) +# key # value (#d additional doc string) #A# start - '...' '../..' + '...' '../..' '....' '../../..' - 'BG' '& exit' - 'C' '| wc -l' - 'G' '|& grep --color=auto' - 'H' '| head' - 'Hl' ' --help |& less -r' #d (Display help in pager) - 'L' '| less' - 'LL' '|& less -r' - 'M' '| most' - 'N' '&>/dev/null' #d (No Output) - 'R' '| tr A-z N-za-m' #d (ROT13) - 'SL' '| sort | less' - 'S' '| sort -u' - 'T' '| tail' - 'V' '|& vim -' + 'BG' '& exit' + 'C' '| wc -l' + 'G' '|& grep --color=auto ' + 'H' '| head' + 'Hl' ' --help |& less -r' #d (Display help in pager) + 'L' '| less' + 'LL' '|& less -r' + 'M' '| most' + 'N' '&>/dev/null' #d (No Output) + 'R' '| tr A-z N-za-m' #d (ROT13) + 'SL' '| sort | less' + 'S' '| sort -u' + 'T' '| tail' + 'V' '|& vim -' #A# end - 'co' "./configure && make && sudo make install" + 'co' './configure && make && sudo make install' ) globalias() { @@ -965,6 +980,7 @@ setopt auto_pushd # make cd push the old directory onto the directory setopt nonomatch # try to avoid the 'zsh: no matches found...' setopt nobeep # avoid "beep"ing setopt pushd_ignore_dups # don't push the same dir twice. +setopt noglobdots # * shouldn't match dotfiles. ever. MAILCHECK=30 # mailchecks REPORTTIME=5 # report about cpu-/system-/user-time of command if running longer than 5 seconds @@ -1024,7 +1040,7 @@ fi battery() { if [[ $BATTERY -gt 0 ]] ; then - PERCENT="${${"$(acpi 2>/dev/null)"}/(#b)[[:space:]]##Battery <->: [^0-9]##, (<->)%*/${match[1]}}" + PERCENT="${${"$(acpi 2>/dev/null)"}/(#b)[[:space:]]#Battery <->: [^0-9]##, (<->)%*/${match[1]}}" if [[ -z "$PERCENT" ]] ; then PERCENT='acpi not present' else @@ -1611,10 +1627,17 @@ VCS_INFO_git_get_data () { # {{{ } # }}} VCS_INFO_hg_get_data () { # {{{ - local hgbranch hgbase + local hgbranch hgbase file hgbase=${vcs_comm[basedir]} - hgbranch=$(< ${hgbase}/.hg/branch) + + file="${hgbase}/.hg/branch" + if [[ -r ${file} ]] ; then + hgbranch=$(< ${file}) + else + hgbranch='default' + fi + VCS_INFO_formats '' "${hgbranch}" "${hgbase}" return 0 } @@ -1675,7 +1698,7 @@ VCS_INFO_detect_by_dir() { #{{{ while [[ ${realbasedir} != '/' ]]; do if [[ -n ${vcs_comm[detect_need_file]} ]] ; then [[ -d ${basedir}/${dirname} ]] && \ - [[ -f ${basedir}/${dirname}/${vcs_comm[detect_need_file]} ]] && \ + [[ -e ${basedir}/${dirname}/${vcs_comm[detect_need_file]} ]] && \ break else [[ -d ${basedir}/${dirname} ]] && break @@ -1729,7 +1752,7 @@ VCS_INFO_git_detect() { #{{{ # }}} VCS_INFO_hg_detect() { #{{{ VCS_INFO_check_com hg || return 1 - vcs_comm[detect_need_file]=branch + vcs_comm[detect_need_file]=store VCS_INFO_detect_by_dir '.hg' return $? } @@ -1899,6 +1922,19 @@ fi # }}} +# command not found handling {{{ + +(( ${COMMAND_NOT_FOUND} == 1 )) && +function command_not_found_handler() { + setopt localoptions no_sh_wordsplit + if [[ -x ${GRML_ZSH_CNF_HANDLER} ]] ; then + ${GRML_ZSH_CNF_HANDLER} $1 + fi + return 1 +} + +# }}} + # {{{ set prompt if zrcautoload promptinit && promptinit 2>/dev/null ; then promptinit # people should be able to use their favourite prompt @@ -2187,6 +2223,11 @@ the zsh yet. :) "NOTITLE=1 zsh" => disable setting the title of xterms without disabling preexec() and precmd() completely "BATTERY=1 zsh" => activate battery status (via acpi) on right side of prompt + "COMMAND_NOT_FOUND=1 zsh" + => Enable a handler if an external command was not found + The command called in the handler can be altered by setting + the GRML_ZSH_CNF_HANDLER variable, the default is: + "/usr/share/command-not-found/command-not-found" A value greater than 0 is enables a feature; a value equal to zero disables it. If you like one or the other of these settings, you can @@ -2249,9 +2290,9 @@ if [[ -r /etc/debian_version ]] ; then fi #a1# Take a look at the syslog: \kbd{\$PAGER /var/log/syslog} - alias llog="$PAGER /var/log/syslog" # take a look at the syslog + salias llog="$PAGER /var/log/syslog" # take a look at the syslog #a1# Take a look at the syslog: \kbd{tail -f /var/log/syslog} - alias tlog="tail -f /var/log/syslog" # follow the syslog + salias tlog="tail -f /var/log/syslog" # follow the syslog fi # sort installed Debian-packages by size @@ -2457,7 +2498,9 @@ grmlcomp() { # use generic completion system for programs not yet defined; (_gnu_generic works # with commands that provide a --help option with "standard" gnu-like output.) - compdef _gnu_generic tail head feh cp mv df stow uname ipacsum fetchipac + for compcom in tail head feh cp mv df stow uname ipacsum fetchipac; do + [[ -z ${_comps[$compcom]} ]] && compdef _gnu_generic ${compcom} + done; unset compcom # see upgrade function in this file compdef _hosts upgrade @@ -2838,6 +2881,17 @@ minimal-shell() { exec env -i ENV="/etc/minimal-shellrc" HOME="$HOME" TERM="$TERM" ksh } +# a wrapper for vim, that deals with title setting +# VIM_OPTIONS +# set this array to a set of options to vim you always want +# to have set when calling vim (in .zshrc.local), like: +# VIM_OPTIONS=( -p ) +# This will cause vim to send every file given on the +# commandline to be send to it's own tab (needs vim7). +vim() { + VIM_PLEASE_SET_TITLE='yes' command vim ${VIM_OPTIONS} "$@" +} + # make a backup of a file bk() { cp -a "$1" "${1}_$(date --iso-8601=seconds)" @@ -2921,7 +2975,11 @@ fi ### non-root (EUID != 0) code below ### -(( GRML_ALWAYS_LOAD_ALL == 0 )) && (( $EUID == 0 )) && return 0 +if (( GRML_ALWAYS_LOAD_ALL == 0 )) && (( $EUID == 0 )) ; then + zrclocal + return 0 +fi + # variables {{{ @@ -2974,11 +3032,6 @@ alias CO="./configure" #a2# Execute \kbd{./configure --help} alias CH="./configure --help" -# http://conkeror.mozdev.org/ -# TODO: I think this should be removed, as conkeror is not a simple extension anymore -#a2# Run a keyboard driven firefox -alias conkeror='firefox -chrome chrome://conkeror/content' - # arch/tla stuff if check_com -c tla ; then #a2# Execute \kbd{tla what-changed --diffs | less} @@ -4201,14 +4254,7 @@ fi #}}} -# finally source a local zshrc {{{ - -# this allows us to stay in sync with grml's zshrc and put own -# modifications in ~/.zshrc.local - -xsource "${HOME}/.zshrc.local" - -# }}} +zrclocal ## genrefcard.pl settings {{{