From 4af49ed67fbf358674d45fb8af3c4c3efaf90f58 Mon Sep 17 00:00:00 2001
From: Timmy Keller <tjk@tjkeller.xyz>
Date: Thu, 7 Jul 2022 15:55:41 -0500
Subject: tons of changes from when website was down

---
 x11/Xresources.G3N2 | 3 ---
 x11/xinitdwmrc      | 3 ---
 x11/xinitrc         | 5 +++--
 x11/xprofile        | 3 ++-
 4 files changed, 5 insertions(+), 9 deletions(-)
 delete mode 100755 x11/xinitdwmrc

(limited to 'x11')

diff --git a/x11/Xresources.G3N2 b/x11/Xresources.G3N2
index 3b8a9fe..c89a8e1 100755
--- a/x11/Xresources.G3N2
+++ b/x11/Xresources.G3N2
@@ -2,6 +2,3 @@ Xft.dpi: 144
 
 Xcursor.theme: default
 Xcursor.size: 36
-
-Sxiv.foreground: #bbbbbb
-Sxiv.background: #222222
diff --git a/x11/xinitdwmrc b/x11/xinitdwmrc
deleted file mode 100755
index 98e2a78..0000000
--- a/x11/xinitdwmrc
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-/home/timmy/.config/x11/xprofile
-exec dwm
diff --git a/x11/xinitrc b/x11/xinitrc
index 3cf1d90..e324ad6 100755
--- a/x11/xinitrc
+++ b/x11/xinitrc
@@ -1,3 +1,4 @@
 #!/bin/sh
-/home/timmy/.config/x11/xprofile
-exec dbus-launch --exit-with-session timmywm
+X11CONFIG=${X11CONFIG:=${XDG_CONFIG_HOME:+$XDG_CONFIG_HOME/x11}}; X11CONFIG=${X11CONFIG:-$HOME/.config/x11}
+X11CONFIG=$X11CONFIG $X11CONFIG/xprofile
+exec dbus-launch --exit-with-session ${1:-timmywm}
diff --git a/x11/xprofile b/x11/xprofile
index 9856eaf..cc71335 100755
--- a/x11/xprofile
+++ b/x11/xprofile
@@ -1,5 +1,6 @@
 #!/bin/sh
-xrdb -merge ${XDG_CONFIG_HOME:-$HOME/.config}/x11/Xresources.$(hostname) 2>/dev/null & xrdbpid=$!
+#xrdb -merge $X11CONFIG/Xresources.$(hostname) 2>/dev/null & xrdbpid=$!
+xrdb -merge $X11CONFIG/Xresources -merge $X11CONFIG/Xresources.$(hostname) 2>/dev/null & xrdbpid=$!
 redshift &
 seasonalwallpaper &
 unclutter -noevents &
-- 
cgit v1.2.3