From 65fcf440c946be276005528486dd11849bf6a847 Mon Sep 17 00:00:00 2001
From: Tom Ryder <tom@sanctum.geek.nz>
Date: Sat, 17 Jul 2021 01:14:07 +1200
Subject: Use ~/.fehbg background if it's set

---
 X/xinitrc.d/background.sh | 7 +++++++
 X/xinitrc.d/xrbg.sh       | 2 --
 2 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 X/xinitrc.d/background.sh
 delete mode 100644 X/xinitrc.d/xrbg.sh

diff --git a/X/xinitrc.d/background.sh b/X/xinitrc.d/background.sh
new file mode 100644
index 00000000..85a40889
--- /dev/null
+++ b/X/xinitrc.d/background.sh
@@ -0,0 +1,7 @@
+# If there's a ~/.fehbg, just run that; otherwise, try to apply a random
+# background image, if the relevant dir exists
+if [ -e "$HOME"/.fehbg ] ; then
+    sh -- "$HOME"/.fehbg
+elif [ -d "${XBACKGROUNDS:-"$HOME"/.xbackgrounds}" ] ; then
+    xrbg
+fi
diff --git a/X/xinitrc.d/xrbg.sh b/X/xinitrc.d/xrbg.sh
deleted file mode 100644
index 0e4ec278..00000000
--- a/X/xinitrc.d/xrbg.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-# Apply a random background image
-xrbg
-- 
cgit v1.2.3