From 7e55ab0424b6cbd9edc68209c4cfb4ac207eda1d Mon Sep 17 00:00:00 2001
From: David Thurstenson <thurstylark@gmail.com>
Date: Mon, 11 Apr 2016 12:25:45 -0500
Subject: [PATCH] Slight formatting changes

---
 .xinitrc | 27 ++++++++-------------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/.xinitrc b/.xinitrc
index 2cf0a4c..203e4cf 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -7,18 +7,11 @@ sysmodmap=/etc/X11/xinit/.Xmodmap
 
 # merge in defaults and keymaps
 
-if [ -f $sysresources ]; then
-    xrdb -merge $sysresources
-fi
-if [ -f $sysmodmap ]; then
-    xmodmap $sysmodmap
-fi
-if [ -f "$userresources" ]; then
-    xrdb -merge "$userresources"
-fi
-if [ -f "$usermodmap" ]; then
-    xmodmap "$usermodmap"
-fi
+[ -f $sysresources ] && xrdb -merge $sysresources
+[ -f $sysmodmap ] && xmodmap $sysmodmap
+[ -f "$userresources" ] && xrdb -merge "$userresources"
+[ -f "$usermodmap" ] && xmodmap "$usermodmap"
+
 
 # start some nice programs
 
@@ -39,10 +32,7 @@ export SSH_AUTH_SOCK
 xautolock -time 30 -locker i3lock -b -d -c 000000 -e -f
 
 # Thurstybook-specific config:
-if [[ "$HOSTNAME" == "thurstybook" ]]; then
-	# start srandrd
-	srandrd ~/.config/srandrd.conf
-fi
+[[ "$HOSTNAME" == "thurstybook" ]] && srandrd ~/.config/srandrd.conf
 
 
 if [[ "$HOSTNAME" == "dtarch" ]]; then
@@ -57,9 +47,8 @@ if [[ "$HOSTNAME" == "dtarch" ]]; then
 fi
 
 # If numlockx is installed, activate it
-if [[ -s /usr/bin/numlockx ]]; then
-	numlockx on
-fi
+[[ -s /usr/bin/numlockx ]] && numlockx on
+
 
 session=${1:-i3}