make log tailing and paging more generic

[etc/zsh.git] / .zsh / zshrc / 30_aliases

diff --git a/.zsh/zshrc/30_aliases b/.zsh/zshrc/30_aliases
index 69087688319c6569fbcc2546f83bc3188d9a49aa..16005bf82c67da0b31ecd6d7585459f0987d5f42 100644 (file)
--- a/.zsh/zshrc/30_aliases
+++ b/.zsh/zshrc/30_aliases
@@ -8,6 +8,8 @@
 # Source repository: git://git.madduck.net/etc/zsh.git
 #
 
+function trace() { eval "set -x; $@" }
+
 alias mv='nocorrect mv'
 alias cp='nocorrect cp'
 alias ln='nocorrect ln'
@@ -68,9 +70,8 @@ alias bug='BROWSER=www-browser bts show'
 
 # handy documentation lookup on Debian
 # from http://www.michael-prokop.at/computer/config/.zshrc
-doc() { cd /usr/share/doc/$1 && ls }
-_doc() { _files -W /usr/share/doc -/ }
-compdef _doc doc
+doc() { cd /usr/share/doc/$1 }
+compdef '_files -W /usr/share/doc -/' doc
 
 alias giti='git init && git add . && git commit -minitial\ checkin && git tag orig'
 
@@ -81,16 +82,24 @@ elif whence tailf >/dev/null; then
 else
   alias t='tail -f'
 fi
-alias tsl='t /var/log/syslog'
-alias lsl='sensible-pager /var/log/syslog'
-alias tml='t /var/log/mail.log'
-alias lml='sensible-pager /var/log/mail.log'
-alias tal='t /var/log/auth.log'
-alias lal='sensible-pager /var/log/auth.log'
-alias tdl='t /var/log/daemon.log'
-alias ldl='sensible-pager /var/log/daemon.log'
-alias tkl='t /var/log/kern.log'
-alias lkl='sensible-pager /var/log/kern.log'
+compdef _files t
+
+function ltail() { t ~log/$1 }
+compdef '_files -W ~log' ltail
+
+function lless() { sensible-pager ~log/$1 }
+compdef '_files -W ~log' lless
+
+alias tsl='ltail syslog'
+alias lsl='lless ~log/syslog'
+alias tml='ltail mail.log'
+alias lml='lless ~log/mail.log'
+alias tal='ltail auth.log'
+alias lal='lless ~log/auth.log'
+alias tdl='ltail daemon.log'
+alias ldl='lless ~log/daemon.log'
+alias tkl='ltail kern.log'
+alias lkl='lless ~log/kern.log'
 
 alias px='ps afux'
 alias mps='ps -ao user,pcpu,start,command'