Merge branch 'master' of ssh://git.madduck.net/~/git/pub/etc/zsh

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

diff --git a/.zsh/zshrc/30_aliases b/.zsh/zshrc/30_aliases
index 1f4634c14477a70518d194586ab24d5ae7bb2da8..6cb0f9df77dac892222d4fabcfbc54fe094129ee 100644 (file)
--- a/.zsh/zshrc/30_aliases
+++ b/.zsh/zshrc/30_aliases
@@ -20,15 +20,18 @@ alias links='noglob links'
 alias wb='noglob www-browser'
 alias wget='noglob wget'
 alias curl='noglob curl'
+alias apt-cache='noglob apt-cache'
+alias locate='noglob locate'
 
-_LS_OPTS='-bCF --color=auto'
+_ls_opts=(-bC --color=auto)
 ls --group-directories-first >/dev/null 2>&1 \
-  && _LS_OPTS="$_LS_OPTS --group-directories-first"
+  && _ls_opts+=--group-directories-first
 # I prefer POSIX collation for ls
-alias ls="LC_COLLATE=POSIX ls $_LS_OPTS"
-unset _LS_OPTS
+alias ls="LC_COLLATE=POSIX ls $_ls_opts"
+unset _ls_opts
 
 alias ll='ls -l'
+alias l=ll
 alias la='ls -a'
 alias lla='ls -la'
 # List only directories and symbolic links that point to directories
@@ -39,6 +42,10 @@ alias lssmall="ls -Srl *(.oL[1,10])"
 alias lsnew="ls -rl *(D.om[1,10])"
 alias lsold="ls -rtlh *(D.om[1,10])"
 
+cd () { builtin cd $* && ll }
+#_cd_l() { ll }
+#chpwd_functions+=_cd_l
+
 alias egrep='egrep --color=auto -d skip'
 alias fgrep='fgrep --color=auto -d skip'
 alias grep='grep --color=auto -d skip'
@@ -62,7 +69,36 @@ compdef _doc doc
 
 alias giti='git init && git add . && git commit -minitial\ checkin'
 
-alias t=tailf
+if whence tailf >/dev/null; then
+  alias t=tailf
+else
+  alias t='tail -f'
+fi
+alias tsl='t /var/log/syslog'
+alias tml='t /var/log/mail.log'
+alias tal='t /var/log/auth.log'
+alias tdl='t /var/log/daemon.log'
+alias tkl='t /var/log/kern.log'
+
+alias px='ps afux'
+alias mps='ps -ao user,pcpu,start,command'
+
+alias bofh='fortune bofh-excuses'
+
+autoload -U baseconv
+alias b2d='baseconv 2 10'
+alias d2b='baseconv 10 2'
+alias d2h='baseconv 10 16'
+alias h2d='baseconv 16 10'
+alias d2o='baseconv 10 8'
+alias o2d='baseconv 8 10'
+
+alias sshnew='ssh -o "StrictHostKeyChecking no"'
+alias scpnew='scp -o "StrictHostKeyChecking no"'
+alias sshtmp='sshnew -o "UserKnownHostsFile /dev/null"'
+alias scptmp='scpnew -o "UserKnownHostsFile /dev/null"'
+
+alias sendmail=/usr/sbin/sendmail
 
 _d() { dict $* }
 d() { _d $* | sensible-pager }