bash/rc, zsh/rc: Move aliases to shell/aliases.

[config/dotfiles.git] / zsh / rc

diff --git a/zsh/rc b/zsh/rc
index f01c5ff2e3b93c6eb8871a07485372ece8253caf..9a413fade98d3c286731e336bac438d61720ca50 100644 (file)
--- a/zsh/rc
+++ b/zsh/rc
@@ -375,6 +375,11 @@ exec 2>>(while read -r line; do
     print -n $'\0';
 done &)
 
+# Load aliases and similar functions also used by other shells.
+if [[ -f ~/.shell/aliases ]]; then
+    . ~/.shell/aliases
+fi
+
 # Make sure aliases are expanded when using sudo.
 alias sudo='sudo '
 
@@ -391,40 +396,6 @@ alias -g ...='../..'
 alias -g ....='../../..'
 alias -g .....='../../../..'
 
-# Shortcuts for often used programs.
-alias c='clear'
-alias e='elinks'
-alias g='git'
-alias m='mutt'
-alias v='vim'
-alias vi='vim'
-
-# Improved ls which displays the files in columns (-C), visualizes
-# directories, links and other special files (-F) and pages everything through
-# less (L).
-#
-# If available use GNU ls with colorized output. If it isn't available use
-# normal ls which needs CLICOLOR_FORCE so it displays colors when used with a
-# pager.
-ls --color &> /dev/null
-if [[ $? -eq 0 ]]; then
-    alias ls='ls --color'
-else
-    alias ls='CLICOLOR_FORCE=1 ls -G'
-fi
-# Main ls function.
-function ls() {
-    command ls -C -F $* L
-}
-# Helper function to list all files.
-function la() {
-    ls -a $*
-}
-# Helper function to list all files in list format with access rights, etc.
-function ll() {
-    la -l $*
-}
-
 # If the window naming feature is used (see above) then use ".zsh" (leading
 # dot) as title name after running clear so it's clear to me that the window
 # is empty. I open so much windows that I don't know in which I have something
@@ -434,24 +405,6 @@ if [[ -n $window_reset ]]; then
     alias clear='clear; window_reset=yes; window_precmd reset'
 fi
 
-# I sometimes confuse editor and shell, print a warning to prevent I exit the
-# shell.
-alias :q='echo "This is not Vim!" >&2'
-
-# Automatically use unified diffs.
-alias diff='diff -u'
-
-# Display all files and use human readable sizes.
-alias du='du -sh'
-
-# Use human readable sizes.
-alias df='df -h'
-
-# Edit the mercurial patch queue series file for the current mercurial
-# repository in Vim. Also change Vim's pwd to the patches directory so other
-# patches can easily be opened.
-alias vqs='vim -c "cd $(hg root)/.hg/patches/" "$(hg root)/.hg/patches/series"'
-
 # Display all branches (except stash) in gitk but only 200 commits as this is
 # much faster. Also put in the background and disown. Thanks to sitaram in
 # #git on Freenode (2009-04-20 15:51).