X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=xinitrc;h=162efa4c22d3c2e3ebbb61c4ab7f89b134facd09;hb=e2fd990755824a259803852496603eb1a1130343;hp=3bf6747d7b8846279e88f3a3e796e24f4270971d;hpb=92cdd73bc91e05562c0b61c4911f276df4c5e438;p=config%2Fdotfiles.git

diff --git a/xinitrc b/xinitrc
index 3bf6747..162efa4 100755
--- 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() {
@@ -32,12 +39,24 @@ installed() {
 }
 
 
+# Options, can be modified in ~/.xinitrc.local. To disable a boolean option
+# set it to an empty value.
+#
+# Default to use a background image.
+set_background=yes
+
+# Load settings for the local system.
+if test -f "$HOME/.xinitrc.local"; then
+    . "$HOME/.xinitrc.local"
+fi
+
+
 # Start ssh-agent if we have private keys, thanks to
 # http://code.haskell.org/XMonadContrib/scripts/xinitrc (read on 2011-06-19).
 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.
@@ -51,14 +70,6 @@ fi
 # Use my X11 key bindings.
 xmodmap "$HOME/.xmodmaprc"
 
-# Default to use a background image. Can be disabled in .xinitrc.local.
-set_background=yes
-
-# Load settings for the local system.
-if test -f "$HOME/.xinitrc.local"; then
-    . "$HOME/.xinitrc.local"
-fi
-
 # Change the background if available.
 if test -f "$HOME/.background" && test -n "$set_background"; then
     if installed hsetroot; then
@@ -79,12 +90,20 @@ 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 XMonad.
+# Start window manager.
 xmonad
+
+# Cleanup.
+#
+# Kill ssh-agent to prevent unused background processes.
+if test -x /usr/bin/ssh-agent; then
+    /usr/bin/ssh-agent -k >/dev/null
+    # No `eval` necessary, we terminate anyway.
+fi