From ad8d028d3fbb840465d3b1485c8d853cbb6497ff Mon Sep 17 00:00:00 2001
From: Ryan Hughes <ryan@heyoodle.com>
Date: Mon, 22 Sep 2025 00:21:26 -0400
Subject: [PATCH] Fix order for UKI generation

---
 install/login/all.sh               |  1 -
 install/login/alt-bootloaders.sh   | 15 +++++++++++++++
 install/login/enable-mkinitcpio.sh | 18 ------------------
 install/login/limine-snapper.sh    | 15 +++++++++++++++
 4 files changed, 30 insertions(+), 19 deletions(-)
 delete mode 100644 install/login/enable-mkinitcpio.sh

diff --git a/install/login/all.sh b/install/login/all.sh
index 80b592ad..4130fc0a 100644
--- a/install/login/all.sh
+++ b/install/login/all.sh
@@ -2,5 +2,4 @@ run_logged $OMARCHY_INSTALL/login/plymouth.sh
 run_logged $OMARCHY_INSTALL/login/default-keyring.sh
 run_logged $OMARCHY_INSTALL/login/sddm.sh
 run_logged $OMARCHY_INSTALL/login/limine-snapper.sh
-run_logged $OMARCHY_INSTALL/login/enable-mkinitcpio.sh
 run_logged $OMARCHY_INSTALL/login/alt-bootloaders.sh
diff --git a/install/login/alt-bootloaders.sh b/install/login/alt-bootloaders.sh
index bb35d9b0..9ce25f20 100644
--- a/install/login/alt-bootloaders.sh
+++ b/install/login/alt-bootloaders.sh
@@ -112,4 +112,19 @@ if ! command -v limine &>/dev/null; then
     echo "  - quiet (for silent boot)"
     echo ""
   fi
+  
+  echo "Re-enabling mkinitcpio hooks..."
+
+  # Restore the specific mkinitcpio pacman hooks
+  if [ -f /usr/share/libalpm/hooks/90-mkinitcpio-install.hook.disabled ]; then
+    sudo mv /usr/share/libalpm/hooks/90-mkinitcpio-install.hook.disabled /usr/share/libalpm/hooks/90-mkinitcpio-install.hook
+  fi
+
+  if [ -f /usr/share/libalpm/hooks/60-mkinitcpio-remove.hook.disabled ]; then
+    sudo mv /usr/share/libalpm/hooks/60-mkinitcpio-remove.hook.disabled /usr/share/libalpm/hooks/60-mkinitcpio-remove.hook
+  fi
+
+  echo "mkinitcpio hooks re-enabled"
+
+  sudo mkinitcpio -P
 fi
diff --git a/install/login/enable-mkinitcpio.sh b/install/login/enable-mkinitcpio.sh
deleted file mode 100644
index 7422d8db..00000000
--- a/install/login/enable-mkinitcpio.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-echo "Re-enabling mkinitcpio hooks..."
-
-# Restore the specific mkinitcpio pacman hooks
-if [ -f /usr/share/libalpm/hooks/90-mkinitcpio-install.hook.disabled ]; then
-  sudo mv /usr/share/libalpm/hooks/90-mkinitcpio-install.hook.disabled /usr/share/libalpm/hooks/90-mkinitcpio-install.hook
-fi
-
-if [ -f /usr/share/libalpm/hooks/60-mkinitcpio-remove.hook.disabled ]; then
-  sudo mv /usr/share/libalpm/hooks/60-mkinitcpio-remove.hook.disabled /usr/share/libalpm/hooks/60-mkinitcpio-remove.hook
-fi
-
-echo "mkinitcpio hooks re-enabled"
-
-if command -v limine &>/dev/null; then
-  sudo limine-update
-else
-  sudo mkinitcpio -P
-fi
diff --git a/install/login/limine-snapper.sh b/install/login/limine-snapper.sh
index 9fe0e7a3..6a037207 100644
--- a/install/login/limine-snapper.sh
+++ b/install/login/limine-snapper.sh
@@ -98,6 +98,21 @@ EOF
   chrootable_systemctl_enable limine-snapper-sync.service
 fi
 
+echo "Re-enabling mkinitcpio hooks..."
+
+# Restore the specific mkinitcpio pacman hooks
+if [ -f /usr/share/libalpm/hooks/90-mkinitcpio-install.hook.disabled ]; then
+  sudo mv /usr/share/libalpm/hooks/90-mkinitcpio-install.hook.disabled /usr/share/libalpm/hooks/90-mkinitcpio-install.hook
+fi
+
+if [ -f /usr/share/libalpm/hooks/60-mkinitcpio-remove.hook.disabled ]; then
+  sudo mv /usr/share/libalpm/hooks/60-mkinitcpio-remove.hook.disabled /usr/share/libalpm/hooks/60-mkinitcpio-remove.hook
+fi
+
+echo "mkinitcpio hooks re-enabled"
+
+sudo limine-update
+
 if [[ -n $EFI ]] && efibootmgr &>/dev/null; then
     # Remove the archinstall-created Limine entry
   while IFS= read -r bootnum; do