X-Git-Url: https://git.madduck.net/etc/zsh.git/blobdiff_plain/ec3bedb921f4b2aebd70a007afc3efdfb6bfbc0d..d49ccb721ff0f7c5e0e6f95626f2e48cb6dc9582:/.zsh/zshrc/30_aliases?ds=sidebyside

diff --git a/.zsh/zshrc/30_aliases b/.zsh/zshrc/30_aliases
index 2855a62..e3e01ec 100644
--- a/.zsh/zshrc/30_aliases
+++ b/.zsh/zshrc/30_aliases
@@ -8,17 +8,26 @@
 # Source repository: http://git.madduck.net/v/etc/zsh.git
 #
 
-alias -g ...=../..
-alias -g ....=../../..
+alias mv='nocorrect mv'
+alias cp='nocorrect cp'
+alias ln='nocorrect ln'
+alias mkdir='nocorrect mkdir'
+alias rm='nocorrect rm'
+
+alias find='noglob find'
+alias w3m='noglob w3m -no-mouse'
+alias links='noglob links'
+alias wb='noglob www-browser'
+alias wget='noglob wget'
+alias curl='noglob curl'
+
+_LS_OPTS='-bCF --color=auto'
+ls --group-directories-first >/dev/null 2>&1 \
+  && _LS_OPTS="$_LS_OPTS --group-directories-first"
+# I prefer POSIX collation for ls
+alias ls="LC_COLLATE=POSIX ls $_LS_OPTS"
+unset _LS_OPTS
 
-alias mv='nocorrect mv'       # no spelling correction on mv
-alias cp='nocorrect cp'       # no spelling correction on cp
-alias mkdir='nocorrect mkdir' # no spelling correction on mkdir
-alias find='noglob find'      # no globbing for find
-
-alias grep=egrep
-
-alias ls='ls -bCF --color=auto'
 alias ll='ls -l'
 alias la='ls -a'
 alias lla='ls -la'
@@ -30,9 +39,14 @@ alias lssmall="ls -Srl *(.oL[1,10])"
 alias lsnew="ls -rl *(D.om[1,10])"
 alias lsold="ls -rtlh *(D.om[1,10])"
 
+alias egrep='egrep --color=auto -d skip'
+alias fgrep='fgrep --color=auto -d skip'
+alias grep='grep --color=auto -d skip'
+
 alias mmv='noglob zmv -W'
-alias zcp=zmv
-alias zln=zmv
+alias zcp='zmv -C'
+alias zln='zmv -L'
+alias zgmv='zmv -p git-mv'
 
 alias cal='cal -3'
 alias ftp=lftp