zshrc: Add a trailing space to the power abbreviation regarding grep(1)

[grml-etc-core.git] / etc / zsh / zshrc

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index cf22e1c..d50493b 100644 (file)
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -443,6 +443,13 @@ 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 {{{
@@ -782,7 +789,7 @@ abk=(
     '....' '../../..'
     'BG' '& exit'
     'C' '| wc -l'
-    'G' '|& grep --color=auto'
+    'G' '|& grep --color=auto '
     'H' '| head'
     'Hl' ' --help |& less -r'      #d (Display help in pager)
     'L' '| less'
@@ -795,57 +802,7 @@ abk=(
     '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'
 )
 
 globalias() {
@@ -1015,6 +972,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
@@ -1987,7 +1945,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,7 +1969,7 @@ 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)
             print -Pn "\e]0;%n@%m: $1\a"
@@ -2971,7 +2929,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 {{{
 
@@ -4251,14 +4213,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 {{{