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 743a55fc26b536928669ca23ab12585fc0faa422..9df703a248bf7c8ae8a2f92addca62f8e24f1797 100644 (file)
--- a/.zsh/zshrc/30_aliases
+++ b/.zsh/zshrc/30_aliases
@@ -23,12 +23,12 @@ 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
@@ -42,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'
@@ -89,11 +93,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 $* }