README: firefox settings

[dotfiles] / .bashrc

diff --git a/.bashrc b/.bashrc
index 7edd8caac413d3ca1ac19027ac59c8d8cb11013a..3cdd83ca39fda8315525605f404db8a0f7ddb643 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -17,10 +17,8 @@ while read -r p; do
     echo "$PATH" | tr ':' '\n' | grep -qxF "$p" || PATH="${p}:$PATH"
 done < <(find -L ~/bin -maxdepth 1 -type d 2> /dev/null)
 
-# Set EMAIL from the freedesktop environment.d
-if ls ~/.config/environment.d/*.conf &> /dev/null; then
-    eval "$(awk -F= '{print $0 ";export " $1}' ~/.config/environment.d/*.conf)"
-fi
+# Set environment variables, eg EMAIL, LANG
+eval "$(cat 2> /dev/null /etc/default/locale /etc/locale.conf ~/.config/environment.d/*.conf | awk -F= '/^[^# ]/ {print $0 ";export " $1}')"
 
 # Pick up SSH agent socket
 if [ -z "$SSH_AUTH_SOCK" ]; then
@@ -175,11 +173,14 @@ function aliasf {
 # ls aliases and colours #
 ##########################
 
-# GNU ls colours
-eval "$(TERM=xterm dircolors 2> /dev/null)"
-
-# BSD ls colours
-export LSCOLORS="ExFxCxDxBxEGEDABAGACAD"
+if command -v dircolors &> /dev/null; then
+    # GNU ls colours
+    eval "$(dircolors)"
+    LS_COLORS+=':ow=30;42'
+else
+    # BSD ls colours
+    export LSCOLORS="ExFxCxDxBxEGEDABAGACAD"
+fi
 
 # Lets find the ls
 if ls --color=auto -v &> /dev/null; then