shell/aliases: Add aliases mv (mv -i) and cp (cp -i -a).

[config/dotfiles.git] / shell / env

diff --git a/shell/env b/shell/env
index 45b98bcfcf6cd2a666a14c8de347d0faf8f8fd78..74f676ce748d93d774bc0c92a20a8ffe001d8408 100644 (file)
--- a/shell/env
+++ b/shell/env
@@ -1,6 +1,6 @@
 # Configuration file for environment related options for all shells.
 
-# Copyright (C) 2011-2012  Simon Ruderich
+# Copyright (C) 2011-2013  Simon Ruderich
 #
 # This file is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@ fi
 EDITOR=vim
 export EDITOR
 
-# Set less as pager, its configuration is done through the .less file.
+# Set less as pager, its configuration is done through the ~/.less file.
 PAGER=less
 export PAGER
 
@@ -58,27 +58,15 @@ elif test -O "$HOME/tmp" && test -d "$HOME/tmp"; then
     export TMP TEMP TMPDIR
 fi
 
-# Change rlwrap's home directory to prevent cluttering ~.
+# Change rlwrap's home directory to prevent cluttering ~/.
 RLWRAP_HOME="$HOME/.shell/rlwrap"
 export RLWRAP_HOME
 
-# Set colors for GNU ls (and zsh completions).
-# See `dircolors --print-database` for possible colors.
-LS_COLORS='no=00'
-LS_COLORS=$LS_COLORS':fi=00'       # normal files: normal
-LS_COLORS=$LS_COLORS':di=34;01'    # directories: blue bold
-LS_COLORS=$LS_COLORS':ln=36'       # symbolic links: cyan
-LS_COLORS=$LS_COLORS':pi=00'       # named pipes: normal
-LS_COLORS=$LS_COLORS':so=00'       # sockets: normal
-LS_COLORS=$LS_COLORS':bd=00'       # block devices: normal
-LS_COLORS=$LS_COLORS':cd=00'       # character devices: normal
-LS_COLORS=$LS_COLORS':or=36;41'    # orphaned links: red background
-LS_COLORS=$LS_COLORS':su=31;01;43' # setuid files: yellow background
-LS_COLORS=$LS_COLORS':sg=31;01;43' # setgid files: yellow background
-LS_COLORS=$LS_COLORS':ow=34;01;41' # directories writable by others: blue background
-LS_COLORS=$LS_COLORS':ex=31;01'    # executables: bold red
-export LS_COLORS
-# Set the same colors for non GNU ls, except for orphaned links which aren't
+# Set colors for GNU ls (and Zsh completions).
+if test -f "$HOME/.shell/dircolors"; then
+    . "$HOME/.shell/dircolors"
+fi
+# Set the same colors for non GNU ls, except for special cases which aren't
 # supported.
 LSCOLORS='ExgxxxxxBxxxxxBdBdExEb'
 #         ^ ^ ^ ^ ^ ^ ^ ^ ^ ^ ^