X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=a2045133fd18bee4d5ee4dc595b60f9a4021cfc5;hb=dbb49d444f52afd54c0a5b11705a769a0f801e32;hp=cf22e1c28b22fa5a98a0092f84b28a7e5fd6f92f;hpb=987bb60144a0483dbb42fb2bf3358bc3edaa0782;p=grml-etc-core.git diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc index cf22e1c..a204513 100644 --- a/etc/zsh/zshrc +++ b/etc/zsh/zshrc @@ -11,6 +11,18 @@ # Global Order: zshenv, zprofile, zshrc, zlogin ################################################################################ +# Contributing: +# If you want to help to improve grml's zsh setup, clone the grml-etc-core +# repository from git.grml.org: +# git clone git://git.grml.org/grml-etc-core.git +# +# Make your changes, commit them; use 'git format-patch' to create a series +# of patches and send those to the following address via 'git send-email': +# grml-etc-core@grml.org +# +# Doing so makes sure the right people get your patches for review and +# possibly inclusion. + # zsh-refcard-tag documentation: {{{ # You may notice strange looking comments in this file. # These are there for a purpose. grml's zsh-refcard can now be @@ -121,6 +133,11 @@ is43(){ return 1 } +is433(){ + [[ $ZSH_VERSION == 4.3.<3->* || $ZSH_VERSION == <5->* ]] && return 0 + return 1 +} + #f1# Checks whether or not you're running grml isgrml(){ [[ -f /etc/grml_version ]] && return 0 @@ -230,6 +247,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,15 +462,20 @@ xunfunction() { return 0 } +# this allows us to stay in sync with grml's zshrc and put own +# modifications in ~/.zshrc.local +zrclocal() { + xsource "/etc/zsh/zshrc.local" + 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 +for var in LANG LC_ALL LC_MESSAGES ; do [[ -n ${(P)var} ]] && export $var done @@ -623,6 +647,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,76 +808,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 - 'hide' "echo -en '\033]50;nil2\007'" - 'tiny' 'echo -en "\033]50;-misc-fixed-medium-r-normal-*-*-80-*-*-c-*-iso8859-15\007"' - 'small' 'echo -en "\033]50;6x10\007"' - 'medium' 'echo -en "\033]50;-misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-15\007"' - 'default' 'echo -e "\033]50;-misc-fixed-medium-r-normal-*-*-140-*-*-c-*-iso8859-15\007"' - 'large' 'echo -en "\033]50;-misc-fixed-medium-r-normal-*-*-150-*-*-c-*-iso8859-15\007"' - 'huge' 'echo -en "\033]50;-misc-fixed-medium-r-normal-*-*-210-*-*-c-*-iso8859-15\007"' - 'smartfont' 'echo -en "\033]50;-artwiz-smoothansi-*-*-*-*-*-*-*-*-*-*-*-*\007"' - 'semifont' 'echo -en "\033]50;-misc-fixed-medium-r-semicondensed-*-*-120-*-*-*-*-iso8859-15\007"' - 'da' 'du -sch' - 'j' 'jobs -l' - 'u' 'translate -i' - 'co' "./configure && make && sudo make install" - 'CH' "./configure --help" - 'conkeror' 'firefox -chrome chrome://conkeror/content' - 'dir' 'ls -lSrah' - 'lad' $'ls -d .*(/)\n# only show dot-directories' - 'lsa' $'ls -a .*(.)\n# only show dot-files' - 'lss' $'ls -l *(s,S,t)\n# only files with setgid/setuid/sticky flag' - 'lsl' $'ls -l *(@[1,10])\n# only symlinks' - 'lsx' $'ls -l *(*[1,10])\n# only executables' - 'lsw' $'ls -ld *(R,W,X.^ND/)\n# world-{readable,writable,executable} files' - 'lsbig' $'ls -flh *(.OL[1,10])\n# display the biggest files' - 'lsd' $'ls -d *(/)\n# only show directories' - 'lse' $'ls -d *(/^F)\n# only show empty directories' - 'lsnew' $'ls -rl *(D.om[1,10])\n# display the newest files' - 'lsold' $'ls -rtlh *(D.om[-11,-1])\n # display the oldest files' - 'lssmall' $'ls -Srl *(.oL[1,10])\n# display the smallest files' - 'rw-' 'chmod 600' - '600' 'chmod u+rw-x,g-rwx,o-rwx' - 'rwx' 'chmod u+rwx' - '700' 'chmod u+rwx,g-rwx,o-rwx' - 'r--' 'chmod u+r-wx,g-rwx,o-rwx' - '644' $'chmod u+rw-x,g+r-wx,o+r-wx\n # 4=r,2=w,1=x' - '755' 'chmod u+rwx,g+r-w+x,o+r-w+x' - 'md' 'mkdir -p ' - 'cmplayer' 'mplayer -vo -fs -zoom fbdev' - 'fbmplayer' 'mplayer -vo -fs -zoom fbdev' - 'fblinks' 'links2 -driver fb' - 'insecssh' 'ssh -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null"' - 'insecscp' 'scp -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null"' - 'fori' 'for i ({..}) { }' - 'cx' 'chmod +x' - 'e' 'print -l' - 'se' 'setopt interactivecomments' - 'va' 'valac --vapidir=../vapi/ --pkg=gtk+-2.0 gtktest.vala' - 'fb2' '=mplayer -vo fbdev -fs -zoom 1>/dev/null -xy 2' - 'fb3' '=mplayer -vo fbdev -fs -zoom 1>/dev/null -xy 3' - 'ci' 'centericq' - 'D' 'export DISPLAY=:0.0' - 'mp' 'mplayer -vo xv -fs -zoom' + 'co' './configure && make && sudo make install' ) globalias() { @@ -883,8 +865,8 @@ alias run-help >&/dev/null && unalias run-help zrcautoload run-help # use via 'esc-h' # completion system -if zrcautoload compinit && compinit 2>/dev/null ; then - compinit 2>/dev/null || print 'Notice: no compinit available :(' +if zrcautoload compinit ; then + compinit || print 'Notice: no compinit available :(' else print 'Notice: no compinit available :(' function zstyle { } @@ -1015,6 +997,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 @@ -1065,6 +1048,95 @@ chpwd() { # }}} +# directory based profiles {{{ + +if is433 ; then + +CHPWD_PROFILE='default' +function chpwd_profiles() { + # Say you want certain settings to be active in certain directories. + # This is what you want. + # + # zstyle ':chpwd:profiles:/usr/src/grml(|/|/*)' profile grml + # zstyle ':chpwd:profiles:/usr/src/debian(|/|/*)' profile debian + # + # When that's done and you enter a directory that matches the pattern + # in the third part of the context, a function called chpwd_profile_grml, + # for example, is called (if it exists). + # + # If no pattern matches (read: no profile is detected) the profile is + # set to 'default', which means chpwd_profile_default is attempted to + # be called. + # + # A word about the context (the ':chpwd:profiles:*' stuff in the zstyle + # command) which is used: The third part in the context is matched against + # ${PWD}. That's why using a pattern such as /foo/bar(|/|/*) makes sense. + # Because that way the profile is detected for all these values of ${PWD}: + # /foo/bar + # /foo/bar/ + # /foo/bar/baz + # So, if you want to make double damn sure a profile works in /foo/bar + # and everywhere deeper in that tree, just use (|/|/*) and be happy. + # + # The name of the detected profile will be available in a variable called + # 'profile' in your functions. You don't need to do anything, it'll just + # be there. + # + # Then there is the parameter $CHPWD_PROFILE is set to the profile, that + # was is currently active. That way you can avoid running code for a + # profile that is already active, by running code such as the following + # at the start of your function: + # + # function chpwd_profile_grml() { + # [[ ${profile} == ${CHPWD_PROFILE} ]] && return 1 + # ... + # } + # + # The initial value for $CHPWD_PROFILE is 'default'. + # + # Version requirement: + # This feature requires zsh 4.3.3 or newer. + # If you use this feature and need to know whether it is active in your + # current shell, there are several ways to do that. Here are two simple + # ways: + # + # a) If knowing if the profiles feature is active when zsh starts is + # good enough for you, you can put the following snippet into your + # .zshrc.local: + # + # (( ${+functions[chpwd_profiles]} )) && print "directory profiles active" + # + # b) If that is not good enough, and you would prefer to be notified + # whenever a profile changes, you can solve that by making sure you + # start *every* profile function you create like this: + # + # function chpwd_profile_myprofilename() { + # [[ ${profile} == ${CHPWD_PROFILE} ]] && return 1 + # print "chpwd(): Switching to profile: $profile" + # ... + # } + # + # That makes sure you only get notified if a profile is *changed*, + # not everytime you change directory, which would probably piss + # you off fairly quickly. :-) + # + # There you go. Now have fun with that. + local -x profile + + zstyle -s ":chpwd:profiles:${PWD}" profile profile || profile='default' + if (( ${+functions[chpwd_profile_$profile]} )) ; then + chpwd_profile_${profile} + fi + + CHPWD_PROFILE="${profile}" + return 0 +} +chpwd_functions=( ${chpwd_functions} chpwd_profiles ) + +fi # is433 + +# }}} + # {{{ display battery status on right side of prompt via running 'BATTERY=1 zsh' if [[ $BATTERY -gt 0 ]] ; then if ! check_com -c acpi ; then @@ -1074,7 +1146,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 @@ -1661,10 +1733,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 } @@ -1725,7 +1804,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 @@ -1779,7 +1858,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 $? } @@ -1949,6 +2028,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 @@ -1987,7 +2079,7 @@ is4 && [[ $NOPRECMD -eq 0 ]] && precmd () { fi # adjust title of xterm # see http://www.faqs.org/docs/Linux-mini/Xterm-Title.html - [[ NOTITLE -gt 0 ]] && return 0 + [[ ${NOTITLE} -gt 0 ]] && return 0 case $TERM in (xterm*|rxvt*) print -Pn "\e]0;%n@%m: %~\a" @@ -2011,9 +2103,9 @@ preexec () { echo -ne "\ek$CMD\e\\" fi # adjust title of xterm - [[ NOTITLE -gt 0 ]] && return 0 + [[ ${NOTITLE} -gt 0 ]] && return 0 case $TERM in - (xterm*|rxvt) + (xterm*|rxvt*) print -Pn "\e]0;%n@%m: $1\a" ;; esac @@ -2237,6 +2329,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 @@ -2299,9 +2396,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 @@ -2507,7 +2604,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 @@ -2888,6 +2987,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)" @@ -2956,10 +3066,6 @@ exit 0; for color in BLUE RED GREEN CYAN YELLOW MAGENTA WHITE ; unset $color # }}} -# source another config file if present {{{ -xsource "/etc/zsh/zshrc.local" -# }}} - # "persistent history" {{{ # just write important commands you always need to ~/.important_commands if [[ -r ~/.important_commands ]] ; then @@ -2971,7 +3077,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 {{{ @@ -3024,11 +3134,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} @@ -4251,14 +4356,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 {{{