From 5aba9de367932be46aa471c71076d9e623d5abce Mon Sep 17 00:00:00 2001
From: katherine <shmibs@shmibbles.me>
Date: Wed, 1 Mar 2017 00:54:06 -0700
Subject: snapshot
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

various smöl changes
---
 .xinitrc | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to '.xinitrc')

diff --git a/.xinitrc b/.xinitrc
index 9a1c860..b8a735a 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -4,7 +4,13 @@
 #merge Xresources
 if [ -s ~/.Xresources ]
 then
-	xrdb -merge ~/.Xresources
+	xrdb -override ~/.Xresources
+fi
+
+#merge Xresources
+if [ -s /tmp/urxvt-theme ]
+then
+	xrdb -override /tmp/urxvt-theme
 fi
 
 #add compose key
@@ -42,7 +48,6 @@ xset -dpms
 xset s off
 
 #daemons
-urxvtd &
 compton -b --backend glx --vsync opengl
 
 #QT style mimic gtk
-- 
cgit v1.2.3