integrate local changes

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

diff --git a/.zsh/zshrc/30_aliases b/.zsh/zshrc/30_aliases
index fd47bc9f8d80ba23d176a762c30509a9ee8b39ed..562f4b9e42d77bfe4363289839356590909513d0 100644 (file)
--- a/.zsh/zshrc/30_aliases
+++ b/.zsh/zshrc/30_aliases
@@ -23,14 +23,14 @@ alias curl='noglob curl'
 alias apt-cache='noglob apt-cache'
 alias locate='noglob locate'
 
-_LS_OPTS='-bCF --color=auto'
-ls --group-directories-first >/dev/null 2>&1 \
-  && _LS_OPTS="$_LS_OPTS --group-directories-first"
+typeset -a _ls_opts; _ls_opts=(-bC --color=auto)
+command ls --group-directories-first >/dev/null 2>&1 \
+  && _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"
 
 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
@@ -41,6 +41,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'
@@ -88,11 +92,6 @@ 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 $* }
@@ -117,4 +116,8 @@ for l in ${(k)_LANGUAGES}; do
 done
 unset _LANGUAGES
 
+alias dpkg-buildpackage="dpkg-buildpackage -k$DEBKEYID"
+
+uc() { unicode --max=0 --colour=off "$@" | sensible-pager }
+
 # vim:ft=zsh