From b0acd0b5e89ad211b93c632bf9490913a84fc907 Mon Sep 17 00:00:00 2001
From: Ryan Hughes <ryan@heyoodle.com>
Date: Sun, 24 Aug 2025 15:50:50 +0200
Subject: [PATCH] Update efibootmgr regex to match nvme + sata + vdisk

---
 install/login/limine-snapper.sh | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/install/login/limine-snapper.sh b/install/login/limine-snapper.sh
index b79cdf00..8fc26881 100644
--- a/install/login/limine-snapper.sh
+++ b/install/login/limine-snapper.sh
@@ -85,11 +85,10 @@ EOF
 fi
 
 # Add UKI entry to UEFI machines to skip bootloader showing on normal boot
-# FIXME: Make this work on real hardware
-# if [ -n "$EFI" ] && efibootmgr &>/dev/null && ! efibootmgr | grep -q Omarchy; then
-#   sudo efibootmgr --create \
-#     --disk "$(findmnt -n -o SOURCE /boot | sed 's/[0-9]*$//')" \
-#     --part "$(findmnt -n -o SOURCE /boot | grep -o '[0-9]*$')" \
-#     --label "Omarchy" \
-#     --loader "\\EFI\\Linux\\$(cat /etc/machine-id)_linux.efi"
-# fi
+if [ -n "$EFI" ] && efibootmgr &>/dev/null && ! efibootmgr | grep -q Omarchy; then
+  sudo efibootmgr --create \
+    --disk "$(findmnt -n -o SOURCE /boot | sed 's/p\?[0-9]*$//')" \
+    --part "$(findmnt -n -o SOURCE /boot | grep -o 'p\?[0-9]*$' | sed 's/^p//')" \
+    --label "Omarchy" \
+    --loader "\\EFI\\Linux\\$(cat /etc/machine-id)_linux.efi"
+fi