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

[config/dotfiles.git] / xinitrc

diff --git a/xinitrc b/xinitrc
index 496295156224ed2afced300e785bbe7eabefda4a..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() {
@@ -37,7 +44,7 @@ installed() {
 if test -x /usr/bin/ssh-agent && test -f "$HOME/.ssh/id_rsa"; then
     # -s to force bourne shell output. This file is a bourne shell script even
     # if the environment might suggest otherwise.
-    eval `/usr/bin/ssh-agent -s`
+    eval `/usr/bin/ssh-agent -s` >/dev/null
 fi
 
 # Use a black background for the root window.
@@ -79,11 +86,11 @@ fi
 
 # Set color temperature of display according to time of day.
 if installed redshift; then
-    redshift -l 49.9:10.9 -t 5500:4500 &
+    redshift -l 49.9:10.9 -t 5500:4500 >/dev/null &
 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.