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 ba69a8e0d829891f1c3e46745afa7ff0493ade09..6cb0f9df77dac892222d4fabcfbc54fe094129ee 100644 (file)
--- a/.zsh/zshrc/30_aliases
+++ b/.zsh/zshrc/30_aliases
@@ -23,14 +23,15 @@ alias curl='noglob curl'
 alias apt-cache='noglob apt-cache'
 alias locate='noglob locate'
 
 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 --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
 # 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 ll='ls -l'

+alias l=ll

 alias la='ls -a'
 alias lla='ls -la'
 # List only directories and symbolic links that point to directories
 alias la='ls -a'
 alias lla='ls -la'
 # List only directories and symbolic links that point to directories


@@ -41,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])"
 
 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'
 alias egrep='egrep --color=auto -d skip'
 alias fgrep='fgrep --color=auto -d skip'
 alias grep='grep --color=auto -d skip'


@@ -64,7 +69,11 @@ compdef _doc doc
 
 alias giti='git init && git add . && git commit -minitial\ checkin'
 
 
 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 tsl='t /var/log/syslog'
 alias tml='t /var/log/mail.log'
 alias tal='t /var/log/auth.log'


@@ -85,10 +94,12 @@ alias d2o='baseconv 10 8'
 alias o2d='baseconv 8 10'
 
 alias sshnew='ssh -o "StrictHostKeyChecking no"'
 alias o2d='baseconv 8 10'
 
 alias sshnew='ssh -o "StrictHostKeyChecking no"'

-alias scpnew='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 sshtmp='sshnew -o "UserKnownHostsFile /dev/null"'
 alias scptmp='scpnew -o "UserKnownHostsFile /dev/null"'
 

+alias sendmail=/usr/sbin/sendmail
+

 _d() { dict $* }
 d() { _d $* | sensible-pager }
 the() { d -d moby-thesaurus $* }
 _d() { dict $* }
 d() { _d $* | sensible-pager }
 the() { d -d moby-thesaurus $* }