X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=e535076539ba7a1152e81f4159fc2fd3c0671b21;hb=94c20637899dfe8666d6a95bd804b883498cc109;hp=46d3d64b91994c7bc354e0ab98d8ff2d7274a9a2;hpb=fb0f5303d1e6bc334c009501cbff754b38e8cff9;p=grml-etc-core.git

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 46d3d64..e535076 100644
--- 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.
-# Latest change: Fre Mai 25 02:03:29 CEST 2007 [mika]
+# Latest change: Mon Jun 04 23:21:01 CEST 2007 [mika]
 ################################################################################
 # This file is sourced only for interactive shells. It
 # should contain commands to set up aliases, functions,
@@ -40,6 +40,7 @@
     printf "      rm ${xof}\n\n"
     printf ' -!- Note, that this message will *not* go away, unless you yourself\n'
     printf ' -!- resolve the situation manually.\n\n'
+    BROKEN_COMPLETION_DIR=1
   fi
   unset xof
 # }}}
@@ -151,12 +152,16 @@
 # completion functions go to /etc/zsh/completion.d
 # function files may be put into /etc/zsh/functions.d, from where they
 # will be automatically autoloaded.
-  [[ -d /etc/zsh/completion.d ]] && 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}
-    done
+  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 )
+     if [[ -d /etc/zsh/functions.d ]] ; then
+       fpath+=( /etc/zsh/functions.d )
+       for func in /etc/zsh/functions.d/[^_]*[^~] ; do
+         autoload -U ${func:t}
+       done
+     fi
   fi
 
 # automatically remove duplicates from these arrays
@@ -690,7 +695,7 @@ ${BLUE}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< %# "
     fi
   '
 
-  # I like clean prompt, so provide simple way to get that
+# I like clean prompt, so provide simple way to get that
   alias 0 &>/dev/null || functions 0 &>/dev/null || alias 0='return 0'
 
 # truecrypt; use e.g. via 'truec /dev/ice /mnt/ice' or 'truec -i'
@@ -783,8 +788,9 @@ Enjoy your grml system with the zsh!$reset_color"
       fi
     }
 
-    isgrmlcd && alias su="sudo su"          # change to user root
-    alias tlog="tail -f /var/log/syslog"    # take a look at the syslog
+    isgrmlcd && alias su="sudo -s"          # get a root shell
+    alias llog="$PAGER /var/log/syslog"     # take a look at the syslog
+    alias tlog="tail -f /var/log/syslog"    # follow the syslog
     alias zshskel="source /etc/skel/.zshrc" # source skeleton zshrc
   fi
 
@@ -1227,6 +1233,28 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"."
     fi
   }
 
+  # just press 'asdf' keys to toggle between dvorak and us keyboard layout
+  aoeu() {
+     if [ -n "$XKEYBOARD" -a -n "$KEYTABLE" ] ; then
+        echo -n "Switching to $KEYTABLE keyboard layout: "
+        [ -z "$DISPLAY" ] && $SUDO loadkeys $KEYTABLE &>/dev/null || setxkbmap $XKEYBOARD &>/dev/null
+     else
+        echo -n 'Switching to us keyboard layout: '
+        [ -z "$DISPLAY" ] && $SUDO loadkeys us &>/dev/null || setxkbmap us &>/dev/null
+     fi
+     echo 'Done'
+  }
+  asdf() {
+     echo -n 'Switching to dvorak keyboard layout: '
+     [ -z "$DISPLAY" ] && $SUDO loadkeys dvorak &>/dev/null || setxkbmap dvorak &>/dev/null
+     echo 'Done'
+  }
+  # just press 'asdf' key to toggle from neon layout to us keyboard layout
+  uiae() {
+     echo -n 'Switching to us keyboard layout: '
+     setxkbmap us && echo 'Done' || echo 'Failed'
+  }
+
   # Switching shell safely and efficiently? http://www.zsh.org/mla/workers/2001/msg02410.html
   # bash() {
   #  NO_SWITCH="yes" command bash "$@"
@@ -1262,5 +1290,9 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"."
   fi
 # }}}
 
+# add variable to be able to check whether the file has been read {{{
+  ZSHRC_GLOBAL_HAS_BEEN_READ=1
+# }}}
+
 ## END OF FILE #################################################################
 # vim:foldmethod=marker expandtab