From 676cc574e18fdabcb0a5b33fce6ee0f63f3f0073 Mon Sep 17 00:00:00 2001
From: Eric Teunis de Boone <ericteunis@deboone.nl>
Date: Sat, 8 Apr 2023 11:43:08 +0200
Subject: [PATCH] Theming: move $theme_name out of theming.cfg

---
 boot/grub/grub.cfg    | 10 ++++++++--
 boot/grub/mytheme.cfg |  2 ++
 boot/grub/theming.cfg |  4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 boot/grub/mytheme.cfg

diff --git a/boot/grub/grub.cfg b/boot/grub/grub.cfg
index 20e4ca7..242d1f0 100644
--- a/boot/grub/grub.cfg
+++ b/boot/grub/grub.cfg
@@ -25,8 +25,14 @@ export imgdevpath rootuuid
 set pager=1
 
 # Get theming
-if [ -f "${prefix}/theming.cfg" ]; then
-	#source "${prefix}/theming.cfg"
+if [ -f "${prefix}/mytheme.cfg" ]; then
+	if [ -f "${prefix}/theming.cfg" ]; then
+		# load theme_name
+		source "${prefix}/mytheme.cfg"
+		
+		# set theme
+		source "${prefix}/theming.cfg"
+	fi
 fi
 
 # Start the menuentries
diff --git a/boot/grub/mytheme.cfg b/boot/grub/mytheme.cfg
new file mode 100644
index 0000000..7683d35
--- /dev/null
+++ b/boot/grub/mytheme.cfg
@@ -0,0 +1,2 @@
+set theme_name="Cyberpunk"
+export theme_name
diff --git a/boot/grub/theming.cfg b/boot/grub/theming.cfg
index 19e5b28..9437920 100644
--- a/boot/grub/theming.cfg
+++ b/boot/grub/theming.cfg
@@ -1,5 +1,5 @@
-
-set theme_name="Cyberpunk"
+# Make sure to have ${theme_name} defined!
+#
 insmod jpeg
 insmod png