From: Simon Ruderich <simon@ruderich.org>
Date: Mon, 27 May 2013 17:11:28 +0000 (+0200)
Subject: xinitrc: Move options to the top.
X-Git-Url: https://ruderich.org/simon/gitweb/?a=commitdiff_plain;h=eb131261be01c2260141299007f24596968d5f35;p=config%2Fdotfiles.git

xinitrc: Move options to the top.
---

diff --git a/xinitrc b/xinitrc
index 696230a..79f3564 100755
--- a/xinitrc
+++ b/xinitrc
@@ -39,6 +39,18 @@ 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
@@ -58,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