projects
/
grml-etc-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
zsh-setup: applied patch from Frank Terbeck for improved
[grml-etc-core.git]
/
etc
/
zsh
/
zshrc
diff --git
a/etc/zsh/zshrc
b/etc/zsh/zshrc
index
9f306ac
..
131a19b
100644
(file)
--- a/
etc/zsh/zshrc
+++ b/
etc/zsh/zshrc
@@
-3,7
+3,7
@@
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
-# Latest change: Son Okt
15 23:20:08 CES
T 2006 [mika]
+# Latest change: Son Okt
29 17:49:13 CE
T 2006 [mika]
################################################################################
# This file is sourced only for interactive shells. It
# should contain commands to set up aliases, functions,
################################################################################
# This file is sourced only for interactive shells. It
# should contain commands to set up aliases, functions,
@@
-14,40
+14,39
@@
# {{{ check for version/system
# check for versions (compatibility reasons)
# {{{ check for version/system
# check for versions (compatibility reasons)
- is4(){
- if [[ $ZSH_VERSION == 4.* ]]; then
- return 0
- else
- return 1
- fi
- }
-
-# current release
- is42(){
- if [[ $ZSH_VERSION == 4.<2->* ]]; then
- return 0
- else
- return 1
- fi
- }
+ if autoload is-at-least && is-at-least ; then
+ is4() { is-at-least 4 }
+ 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
# grml specific stuff
isgrml(){
# grml specific stuff
isgrml(){
- if [ -f /etc/grml_version ] ; then
- return 0
- else
- return 1
- fi
+ [ -f /etc/grml_version ] && return 0
+ return 1
}
isgrmlcd(){
}
isgrmlcd(){
- if [ -f /etc/grml_cd ] ; then
- return 0
- else
- return 1
- fi
+ [ -f /etc/grml_cd ] && return 0
+ return 1
}
}
+ if isgrml ; then
+ isgrmlsmall() {
+ [[ ${${${(f)"$(</etc/grml_version)"}%% *}##*-} == 'small' ]] && return 0 ; return 1
+ }
+ else
+ isgrmlsmall() { return 1 }
+ fi
+
# check for user, if not running as root set $SUDO to sudo
(( EUID != 0 )) && SUDO='sudo' || SUDO=''
# check for user, if not running as root set $SUDO to sudo
(( EUID != 0 )) && SUDO='sudo' || SUDO=''
@@
-63,9
+62,8
@@
# }}}
# {{{ set some variables
# }}}
# {{{ set some variables
- [[ -z "$EDITOR" ]] && export EDITOR='vim'
- [[ -z "$SHELL" ]] && export SHELL='/bin/zsh'
- [[ -z "$MAIL" ]] && export MAIL="/var/mail/$USER"
+ export EDITOR=${EDITOR:-vim}
+ export MAIL=${MAIL:-/var/mail/$USER}
[[ -f ~/.terminfo/m/mostlike ]] && MYLESS='LESS=C TERMINFO=~/.terminfo TERM=mostlike less' || MYLESS='less'
[[ -x /usr/bin/dircolors ]] && eval `dircolors -b`
[[ -f ~/.terminfo/m/mostlike ]] && MYLESS='LESS=C TERMINFO=~/.terminfo TERM=mostlike less' || MYLESS='less'
[[ -x /usr/bin/dircolors ]] && eval `dircolors -b`
@@
-132,25
+130,38
@@
fi
# we don't want to quote/espace URLs on our own...
# avoid 'url-quote-magic: function definition file not found' on some older boxes
# we don't want to quote/espace URLs on our own...
# avoid 'url-quote-magic: function definition file not found' on some older boxes
- if [ -f /usr/share/zsh/$ZSH_VERSION/functions/Zle/url-quote-magic ] ; then
- autoload -U url-quote-magic
- zle -N self-insert url-quote-magic
+ if [ -f "/usr/share/zsh/$ZSH_VERSION/functions/Zle/url-quote-magic" ] ; then
+ autoload -U url-quote-magic && zle -N self-insert url-quote-magic
+ else
+ print 'Notice: no url-quote-magic available :('
fi
alias run-help >&/dev/null && unalias run-help
autoload run-help # use via 'esc-h'
fi
alias run-help >&/dev/null && unalias run-help
autoload run-help # use via 'esc-h'
- is4 && autoload -U compinit && compinit # completition system
+# completion system
+ is42 && if autoload -U compinit && [ -f "/usr/share/zsh/$ZSH_VERSION/functions/Completion/compinit" ] ; then
+ compinit
+ else
+ print 'Notice: no compinit available :('
+ function zstyle { }
+ function compdef { }
+ fi
is4 && autoload -U zed # use ZLE editor to edit a file or function
is4 && autoload -U zed # use ZLE editor to edit a file or function
- is4 && zmodload -i zsh/complist
- is4 && zmodload -i zsh/deltochar
- is4 && zmodload -i zsh/mathfunc
+ is4 && \
+ for mod in complist deltochar mathfunc ; do
+ zmodload -i zsh/${mod}
+ done
# autoload zsh modules when they are referenced
# autoload zsh modules when they are referenced
- is4 && zmodload -a zsh/stat stat
- is4 && zmodload -a zsh/zpty zpty
- is4 && zmodload -a zsh/zprof zprof
- is4 && zmodload -ap zsh/mapfile mapfile
+ is4 && \
+ for opt mod in a stat \
+ a zpty \
+ a zprof \
+ ap mapfile ; do
+ zmodload -${opt} zsh/${mod} ${mod}
+ done
+ unset opt mod
is4 && autoload -U insert-files && \
zle -N insert-files && \
is4 && autoload -U insert-files && \
zle -N insert-files && \
@@
-164,6
+175,9
@@
fi
zle -N edit-command-line && \
bindkey '\ee' edit-command-line
zle -N edit-command-line && \
bindkey '\ee' edit-command-line
+## menu selection: pick item but stay in the menu (press esc-return)
+ is4 && bindkey -M menuselect '\e^M' accept-and-menu-complete
+
# press "ctrl-e d" to insert the actual date in the form yyyy-mm-dd
_bkdate() { BUFFER="$BUFFER$(date '+%F')"; CURSOR=$#BUFFER; }
bindkey '\C-ed' _bkdate
# press "ctrl-e d" to insert the actual date in the form yyyy-mm-dd
_bkdate() { BUFFER="$BUFFER$(date '+%F')"; CURSOR=$#BUFFER; }
bindkey '\C-ed' _bkdate
@@
-272,15
+286,21
@@
fi
# }}}
# {{{ set prompt
# }}}
# {{{ set prompt
- autoload promptinit ; promptinit # people should be able to use their favourite prompt
+ if [ -f "/usr/share/zsh/$ZSH_VERSION/functions/Prompts/promptinit" ] ; then
+ autoload promptinit && promptinit # people should be able to use their favourite prompt
+ else
+ print 'Notice: no prompiinit available :('
+ fi
# precmd() => a function which is executed just before each prompt
# precmd () { setopt promptsubst; [[ -o interactive ]] && jobs -l;
# run 'NOPRECMD=1 zsh' to disable the precmd + preexec commands
is4 && ! [[ -n "$NOPRECMD" ]] && precmd () {
if [ -n "$BATTERY" ] ; then
# precmd() => a function which is executed just before each prompt
# precmd () { setopt promptsubst; [[ -o interactive ]] && jobs -l;
# run 'NOPRECMD=1 zsh' to disable the precmd + preexec commands
is4 && ! [[ -n "$NOPRECMD" ]] && precmd () {
if [ -n "$BATTERY" ] ; then
- RPROMPT="%(?..:()% ${PERCENT}${SCREENTITLE}"
+ # RPROMPT="%(?..:()% ${PERCENT}${SCREENTITLE}"
+ RPROMPT="${PERCENT}${SCREENTITLE}"
else
else
- RPROMPT="%(?..:()% ${SCREENTITLE}"
+ # RPROMPT="%(?..:()% ${SCREENTITLE}"
+ RPROMPT="${SCREENTITLE}"
fi
# adjust title of xterm
# see http://www.faqs.org/docs/Linux-mini/Xterm-Title.html
fi
# adjust title of xterm
# see http://www.faqs.org/docs/Linux-mini/Xterm-Title.html
@@
-318,13
+338,24
@@
fi
esac
}
esac
}
+# set colors
+ if autoload colors && colors ; then
+ BLUE="%{${fg[blue]}%}"
+ RED="%{${fg_bold[red]}%}"
+ GREEN="%{${fg[green]}%}"
+ CYAN="%{${fg[cyan]}%}"
+ WHITE="%{${fg[white]}%}"
+ NO_COLOUR="%{${reset_color}%}"
+ else
+ BLUE="%{
\e
[1;34m%}"
+ RED="%{
\e
[1;31m%}"
+ GREEN="%{
\e
[1;32m%}"
+ CYAN="%{
\e
[1;36m%}"
+ WHITE="%{
\e
[1;37m%}"
+ NO_COLOUR="%{
\e
[0m%}"
+ fi
+
EXITCODE="%(?..%?%1v )"
EXITCODE="%(?..%?%1v )"
- local BLUE="%{
\e
[1;34m%}"
- local RED="%{
\e
[1;31m%}"
- local GREEN="%{
\e
[1;32m%}"
- local CYAN="%{
\e
[1;36m%}"
- local WHITE="%{
\e
[1;37m%}"
- local NO_COLOUR="%{
\e
[0m%}"
PS2='`%_> ' # secondary prompt, printed when the shell needs more information to complete a command.
PS3='?# ' # selection prompt used within a select loop.
PS4='+%N:%i:%_> ' # the execution trace prompt (setopt xtrace). default: '+%N:%i>'
PS2='`%_> ' # secondary prompt, printed when the shell needs more information to complete a command.
PS3='?# ' # selection prompt used within a select loop.
PS4='+%N:%i:%_> ' # the execution trace prompt (setopt xtrace). default: '+%N:%i>'
@@
-518,6
+549,7
@@
grmlcomp() {
zstyle ':completion:*:*:lintian:*' file-patterns '*.deb' # complete debian packages for command 'lintian'
zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}' # match uppercase from lowercase
zstyle ':completion:*:matches' group 'yes' # separate matches into groups
zstyle ':completion:*:*:lintian:*' file-patterns '*.deb' # complete debian packages for command 'lintian'
zstyle ':completion:*' matcher-list 'm:{a-z}={A-Z}' # match uppercase from lowercase
zstyle ':completion:*:matches' group 'yes' # separate matches into groups
+ zstyle ':completion:*' group-name ''
if [[ -z "$NOMENU" ]] ; then
zstyle ':completion:*' menu select=5 # if there are more than 5 options allow selecting from a menu
else
if [[ -z "$NOMENU" ]] ; then
zstyle ':completion:*' menu select=5 # if there are more than 5 options allow selecting from a menu
else
@@
-535,8
+567,9
@@
grmlcomp() {
zstyle ':completion::(^approximate*):*:functions' ignored-patterns '_*' # Ignore completion functions for commands you don't have:
# complete manual by their section
zstyle ':completion::(^approximate*):*:functions' ignored-patterns '_*' # Ignore completion functions for commands you don't have:
# complete manual by their section
- zstyle ':completion:*:manuals' separate-sections true
- zstyle ':completion:*:man:*' menu yes select
+ zstyle ':completion:*:manuals' separate-sections true
+ zstyle ':completion:*:manuals.*' insert-sections true
+ zstyle ':completion:*:man:*' menu yes select
## correction
# run rehash on completion so new installed program are found automatically:
## correction
# run rehash on completion so new installed program are found automatically:
@@
-566,6
+599,17
@@
grmlcomp() {
# zstyle ':completion:*' completer _complete _correct _approximate
# zstyle ':completion:*' expand prefix suffix
# zstyle ':completion:*' completer _complete _correct _approximate
# zstyle ':completion:*' expand prefix suffix
+# automatic rehash? Credits go to Frank Terbeck
+# function 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
hosts=(`hostname` grml.org)
zstyle '*' hosts $hosts
# command for process lists, the local web server details and host completion
hosts=(`hostname` grml.org)
zstyle '*' hosts $hosts
@@
-656,16
+700,34
@@
If you want to use xinit anyway please call \"/usr/bin/xinit\"."
setenv() { typeset -x "${1}${1:+=}${(@)argv[2,$#]}" } # csh compatibility
freload() { while (( $# )); do; unfunction $1; autoload -U $1; shift; done }
manzsh() { /usr/bin/man zshall | vim -c "se ft=man| se hlsearch" +/"$1" - ; }
setenv() { typeset -x "${1}${1:+=}${(@)argv[2,$#]}" } # csh compatibility
freload() { while (( $# )); do; unfunction $1; autoload -U $1; shift; done }
manzsh() { /usr/bin/man zshall | vim -c "se ft=man| se hlsearch" +/"$1" - ; }
+# manzsh() { /usr/bin/man zshall | most +/"$1" ; }
# manzsh() { man zshall | $MYLESS -p $1 ; }
# manzsh() { man zshall | $MYLESS -p $1 ; }
-# manzsh() { /usr/bin/man zshall | most +/"$1" ; }
# use "dchange <package-name>" to view Debian's changelog of the package:
# use "dchange <package-name>" to view Debian's changelog of the package:
- dchange() { most /usr/share/doc/${1}/changelog.Debian.gz ; }
+ dchange() {
+ if [ -r /usr/share/doc/${1}/changelog.Debian.gz ] ; then
+ most /usr/share/doc/${1}/changelog.Debian.gz
+ else
+ if [ -r /usr/share/doc/${1}/changelog.gz ] ; then
+ most /usr/share/doc/${1}/changelog.gz
+ else
+ echo "No changelog for package $1 found, sorry."
+ return 1
+ fi
+ fi
+ }
_dchange() { _files -W /usr/share/doc -/ }
compdef _dchange dchange
# use "uchange <package-name>" to view upstream's changelog of the package:
_dchange() { _files -W /usr/share/doc -/ }
compdef _dchange dchange
# use "uchange <package-name>" to view upstream's changelog of the package:
- uchange() { most /usr/share/doc/${1}/changelog.gz ; }
+ uchange() {
+ if [ -r /usr/share/doc/${1}/changelog.gz ] ; then
+ most /usr/share/doc/${1}/changelog.gz
+ else
+ echo "No changelog for package $1 found, sorry."
+ return 1
+ fi
+ }
_uchange() { _files -W /usr/share/doc -/ }
compdef _uchange uchange
_uchange() { _files -W /usr/share/doc -/ }
compdef _uchange uchange
@@
-684,13
+746,16
@@
If you want to use xinit anyway please call \"/usr/bin/xinit\"."
# use it e.g. via 'Restart apache2'
if [ -d /etc/init.d ] ; then
for i in Start Restart Stop Reload ; do
# use it e.g. via 'Restart apache2'
if [ -d /etc/init.d ] ; then
for i in Start Restart Stop Reload ; do
- eval "$i() { $SUDO /etc/init.d/\$1 ${i:l} $2 ; }"
+ eval "$i() { $SUDO /etc/init.d/\$1 ${i:l}
\
$2 ; }"
done
# now the completion for this:
compctl -g "$(echo /etc/init.d/*(:t))" Start Restart Stop Reload
fi
# }}}
done
# now the completion for this:
compctl -g "$(echo /etc/init.d/*(:t))" Start Restart Stop Reload
fi
# }}}
+# make sure our environment is clean regarding colors
+ for color in BLUE RED GREEN CYAN WHITE ; unset $color
+
# source another config file if present {{{
if [ -r /etc/zsh/zshrc.local ]; then
source /etc/zsh/zshrc.local
# source another config file if present {{{
if [ -r /etc/zsh/zshrc.local ]; then
source /etc/zsh/zshrc.local