From 14c6ac2cc53ae0975162a373ff08ee8e096d7d6e Mon Sep 17 00:00:00 2001
From: Ryan Hughes <1630358+ryanrhughes@users.noreply.github.com>
Date: Tue, 9 Sep 2025 20:25:17 -0400
Subject: [PATCH] Revert "Add plymouth"

This reverts commit d9c5b96ca5a1249d0b41fbd3447b418e1558e369.
---
 builder/offline.sh                 | 18 +++---------
 builder/patches/add-plymouth.patch | 44 ------------------------------
 2 files changed, 4 insertions(+), 58 deletions(-)
 delete mode 100644 builder/patches/add-plymouth.patch

diff --git a/builder/offline.sh b/builder/offline.sh
index 6329dc4..0abf272 100755
--- a/builder/offline.sh
+++ b/builder/offline.sh
@@ -30,7 +30,6 @@ arch_packages=(
   gum
   jq
   openssl
-  plymouth
   tzupdate # This is technically an AUR package
 )
 
@@ -97,7 +96,10 @@ printf '%s\n' "${arch_packages[@]}" >>"$build_cache_dir/packages.x86_64"
 # Need to do this from the cache_dir
 cd $build_cache_dir
 for patch in /builder/patches/*.patch; do
-  git apply "$patch"
+  # Skip profiledef.patch as it conflicts with offline/permissions.patch
+  if [[ "$(basename "$patch")" != "profiledef.patch" ]]; then
+    git apply "$patch"
+  fi
 done
 cd -
 
@@ -126,18 +128,6 @@ git clone -b $OMARCHY_INSTALLER_REF --single-branch https://github.com/$OMARCHY_
 mkdir -p "$build_cache_dir/airootfs/root/.local/share/applications/icons"
 cp /builder/icons/*.png "$build_cache_dir/airootfs/root/.local/share/applications/icons/"
 
-# Copy plymouth theme to the system location
-mkdir -p "$build_cache_dir/airootfs/usr/share/plymouth/themes/omarchy"
-cp "$build_cache_dir/airootfs/root/omarchy/default/plymouth/"* "$build_cache_dir/airootfs/usr/share/plymouth/themes/omarchy/"
-
-# Configure plymouth to use our theme
-mkdir -p "$build_cache_dir/airootfs/etc/plymouth"
-tee "$build_cache_dir/airootfs/etc/plymouth/plymouthd.conf" >/dev/null <<EOF
-[Daemon]
-Theme=omarchy
-ShowDelay=0
-EOF
-
 # Copy the autostart script (we'll need to create an offline version)
 cp /builder/cmds/autostart-offline.sh $build_cache_dir/airootfs/root/.automated_script.sh
 
diff --git a/builder/patches/add-plymouth.patch b/builder/patches/add-plymouth.patch
deleted file mode 100644
index 2b84fbd..0000000
--- a/builder/patches/add-plymouth.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/airootfs/etc/mkinitcpio.conf.d/archiso.conf
-+++ b/airootfs/etc/mkinitcpio.conf.d/archiso.conf
-@@ -1,3 +1,4 @@
--HOOKS=(base udev microcode modconf kms memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard)
-+HOOKS=(base udev plymouth microcode modconf kms memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard)
-+MODULES=(i915 amdgpu radeon nouveau)
- COMPRESSION="xz"
- COMPRESSION_OPTIONS=(-9e)
-
---- a/grub/grub.cfg
-+++ b/grub/grub.cfg
-@@ -53,13 +53,13 @@ timeout_style=menu
-
- menuentry "Arch Linux install medium (%ARCH%, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' {
-     set gfxpayload=keep
--    linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID%
-+    linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% quiet splash
-     initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img
- }
-
- menuentry "Arch Linux install medium with speakup screen reader (%ARCH%, ${archiso_platform})" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'archlinux-accessibility' {
-     set gfxpayload=keep
--    linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on
-+    linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on quiet splash
-     initrd /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img
- }
-
---- a/syslinux/archiso_sys-linux.cfg
-+++ b/syslinux/archiso_sys-linux.cfg
-@@ -6,7 +6,7 @@ ENDTEXT
- MENU LABEL Arch Linux install medium (x86_64, BIOS)
- LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
- INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
--APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID%
-+APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% quiet splash
-
- # Accessibility boot option
- LABEL arch64speech
-@@ -17,4 +17,4 @@ ENDTEXT
- MENU LABEL Arch Linux install medium (x86_64, BIOS) with ^speech
- LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
- INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
--APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on
-+APPEND archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% accessibility=on quiet splash