From 9fb52fa37ac4cd3737138c1db2b9f6ae9b55a44c Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Mon, 25 May 2026 22:50:24 +0200
Subject: [PATCH] Fix cleaning up the first-run sudo rm

---
 bin/omarchy-first-run                       | 2 +-
 install/first-run/cleanup-reboot-sudoers.sh | 4 +---
 install/preflight/first-run-mode.sh         | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/bin/omarchy-first-run b/bin/omarchy-first-run
index be2c9685..8e2c024d 100755
--- a/bin/omarchy-first-run
+++ b/bin/omarchy-first-run
@@ -18,7 +18,7 @@ if [[ -f $FIRST_RUN_MODE ]]; then
   bash "$OMARCHY_PATH/install/first-run/gdk-scale.sh"
   bash "$OMARCHY_PATH/install/first-run/gtk-primary-paste.sh"
   omarchy-hook-install post-update "$OMARCHY_PATH/install/first-run/install-voxtype.hook"
-  sudo rm -f /etc/sudoers.d/first-run
+  sudo /bin/rm -f /etc/sudoers.d/first-run
 
   bash "$OMARCHY_PATH/install/first-run/welcome.sh"
   bash "$OMARCHY_PATH/install/first-run/wifi.sh"
diff --git a/install/first-run/cleanup-reboot-sudoers.sh b/install/first-run/cleanup-reboot-sudoers.sh
index ccc9966b..9a3ebf75 100644
--- a/install/first-run/cleanup-reboot-sudoers.sh
+++ b/install/first-run/cleanup-reboot-sudoers.sh
@@ -1,3 +1 @@
-if sudo test -f /etc/sudoers.d/99-omarchy-installer-reboot; then
-  sudo rm -f /etc/sudoers.d/99-omarchy-installer-reboot
-fi
+sudo /bin/rm -f /etc/sudoers.d/99-omarchy-installer-reboot
diff --git a/install/preflight/first-run-mode.sh b/install/preflight/first-run-mode.sh
index 536058cc..5e9b67f5 100644
--- a/install/preflight/first-run-mode.sh
+++ b/install/preflight/first-run-mode.sh
@@ -4,7 +4,7 @@ touch ~/.local/state/omarchy/first-run.mode
 
 # Setup sudo-less access for first-run
 sudo tee /etc/sudoers.d/first-run >/dev/null <<EOF
-Cmnd_Alias FIRST_RUN_CLEANUP = /bin/rm -f /etc/sudoers.d/first-run
+Cmnd_Alias FIRST_RUN_CLEANUP = /bin/rm -f /etc/sudoers.d/first-run, /bin/rm -f /etc/sudoers.d/99-omarchy-installer-reboot
 Cmnd_Alias SYMLINK_RESOLVED = /usr/bin/ln -sf /run/systemd/resolve/stub-resolv.conf /etc/resolv.conf
 $USER ALL=(ALL) NOPASSWD: /usr/bin/systemctl
 $USER ALL=(ALL) NOPASSWD: /usr/bin/ufw