X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=shell%2Fenv;h=e06969580eb62ee9865e2494f5ccf6c374580a68;hb=fbccdd97782f162178d19ade50fd8f120394754b;hp=18271f528596bc2bef750d19348a6bd294b3e886;hpb=5ce0b37429d5311d52568524c7a07785c95c97de;p=config%2Fdotfiles.git

diff --git a/shell/env b/shell/env
index 18271f5..e069695 100644
--- 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
@@ -16,13 +16,33 @@
 # along with this file.  If not, see <http://www.gnu.org/licenses/>.
 
 
-source_debug ". ~/.shell/env"
-
-
 # Use UTF-8 encoding in the terminal. Don't use LC_ALL as it's used for
-# debugging purposes. Thanks to twb in Freenode/#screen (2009-10-02 10:25).
+# debugging purposes. Thanks to twb in #screen on Freenode (2009-10-02 10:25
+# CET).
 LANG=en_US.UTF-8
 export LANG
+# Use C locale when sorting.
+LC_COLLATE=C
+export LC_COLLATE
+
+# Just in case a nice administrator tries to force LC_ALL on us ...
+unset LC_ALL
+# Also reset the rest just in case.
+unset LC_ADDRESS
+unset LC_CTYPE
+unset LC_IDENTIFICATION
+unset LC_MEASUREMENT
+unset LC_MESSAGES
+unset LC_MONETARY
+unset LC_NAME
+unset LC_NUMERIC
+unset LC_PAPER
+unset LC_TELEPHONE
+unset LC_TIME
+
+# Make sure $LANGUAGE is not set. It's a GNU extension which can overwrite
+# variables like $LANG or $LC_ALL.
+unset LANGUAGE
 
 # Add ~/bin and ~/.bin and ~/.shell/bin to PATH if available.
 if test -d "$HOME/.shell/bin"; then
@@ -39,10 +59,28 @@ 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
 
+escape=`printf '\033'`
+# Color man pages viewed with less, thanks to [1].
+#
+# [1]: http://nion.modprobe.de/blog/archives/572-less-colors-for-man-pages.html
+#
+# Color bold strings in bold blue.
+LESS_TERMCAP_md="${escape}[01;34m"
+LESS_TERMCAP_me="${escape}[0m"
+export LESS_TERMCAP_md LESS_TERMCAP_me
+# Color underlined strings in bold yellow and underlined.
+LESS_TERMCAP_us="${escape}[01;4;33m"
+LESS_TERMCAP_ue="${escape}[0m"
+export LESS_TERMCAP_us LESS_TERMCAP_ue
+# Color standout mode in bold black with yellow background.
+LESS_TERMCAP_so="${escape}[01;30;43m"
+LESS_TERMCAP_se="${escape}[0m"
+export LESS_TERMCAP_so LESS_TERMCAP_se
+
 # Use ~/.tmp as directory for temporary files if available to reduce security
 # problems on multi-user systems.
 if test -O "$HOME/.tmp" && test -d "$HOME/.tmp"; then
@@ -58,7 +96,7 @@ 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
 
@@ -84,7 +122,4 @@ LSCOLORS='ExgxxxxxBxxxxxBdBdExEb'
 #         *--------------------- directory
 export LSCOLORS
 
-
-source_debug ". ~/.shell/env (done)"
-
 # vim: ft=sh