xinitrc: Load general shell environment from ~/.shell/env.

[config/dotfiles.git] / xinitrc

diff --git a/xinitrc b/xinitrc
index af210f6b3f277492c8c83357b8b433af2398eda7..696230a455b997b61d9a7d669e767c85ac7a51bf 100755 (executable)
--- a/xinitrc
+++ b/xinitrc
@@ -21,10 +21,17 @@
 # Some systems don't set the LANG environment variable when starting xinitrc,
 # this causes problems for rxvt-unicode-256color which fails to display UTF-8
 # characters correctly when LANG is missing and for notify.py which also needs
-# LANG set (for Python's decode() function). Therefore set it here, might be
-# overwritten by shell setup scripts.
-LANG=en_US.UTF-8
-export LANG
+# LANG set (for Python's decode() function). Therefore load my general shell
+# environment which also includes $LANG.
+if test -f "$HOME/.shell/env"; then
+    # Debug function used in ~/.shell/env.
+    source_debug() {
+        # Do nothing.
+        :
+    }
+
+    . "$HOME/.shell/env"
+fi
 
 
 installed() {
@@ -83,7 +90,7 @@ if installed redshift; then
 fi
 
 
-# XMonad doesn't start a shell on its own, start one when I login.
+# XMonad doesn't start a terminal emulator on its own, start one when I login.
 (urxvt || rxvt || xterm) &
 
 # Start window manager.