From 172174ba4a2670885d156885fcade5a1b75d4d68 Mon Sep 17 00:00:00 2001
From: David Thurstenson <thurstylark@gmail.com>
Date: Mon, 25 Jan 2016 10:28:12 -0600
Subject: [PATCH] Added 'numlockx on'

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

diff --git a/.xinitrc b/.xinitrc
index a3bdf18..cfbaa2d 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -8,33 +8,14 @@ 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
@@ -49,6 +30,8 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
 fi
 
 
+#== Thurstylark additions below ==#
+
 eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
 export SSH_AUTH_SOCK
 
@@ -63,6 +46,12 @@ if [[ "$HOSTNAME" == "dtarch" ]]; then
 	# Set the bell to be different from Matt's 
 	xset b 75 750 50
 fi
+
+# If numlockx is installed, activate it
+if [[ -s /usr/bin/numlockx ]]; then
+	numlockx on
+fi
+
 session=${1:-i3}
 
 case $session in