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

diff --git a/.zsh/zshrc/30_aliases b/.zsh/zshrc/30_aliases
index 787c617..e3e01ec 100644
--- a/.zsh/zshrc/30_aliases
+++ b/.zsh/zshrc/30_aliases
@@ -8,22 +8,25 @@
 # 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'
+alias w3m='noglob w3m -no-mouse'
 alias links='noglob links'
 alias wb='noglob www-browser'
+alias wget='noglob wget'
+alias curl='noglob curl'
 
-if ls --group-directories-first >/dev/null 2>&1; then
-  alias ls='ls -bCF --color=auto --group-directories-first'
-else
-  alias ls='ls -bCF --color=auto'
-fi
+_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 ll='ls -l'
 alias la='ls -a'
@@ -41,8 +44,9 @@ 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