From 661eed264087e1056f5d2f2801ea0514aff0f653 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Mon, 25 Aug 2025 07:28:59 +0200
Subject: [PATCH] Prepare for firewall to be setup on first run

---
 bin/omarchy-menu                                          | 3 +--
 install.sh                                                | 1 -
 install/development/firewall.sh                           | 5 -----
 .../first-run/firewall.sh                                 | 8 --------
 migrations/1752709610.sh                                  | 2 --
 5 files changed, 1 insertion(+), 18 deletions(-)
 delete mode 100644 install/development/firewall.sh
 rename bin/omarchy-install-firewall => install/first-run/firewall.sh (74%)
 mode change 100755 => 100644
 delete mode 100644 migrations/1752709610.sh

diff --git a/bin/omarchy-menu b/bin/omarchy-menu
index 173d9834..7fa51704 100755
--- a/bin/omarchy-menu
+++ b/bin/omarchy-menu
@@ -192,8 +192,7 @@ show_install_menu() {
 }
 
 show_install_service_menu() {
-  case $(menu "Install" "󱨑  Firewall\n  Dropbox\n  Tailscale") in
-  *Firewall*) present_terminal omarchy-install-firewall ;;
+  case $(menu "Install" "  Dropbox\n  Tailscale") in
   *Dropbox*) present_terminal omarchy-install-dropbox ;;
   *Tailscale*) present_terminal omarchy-install-tailscale ;;
   *) show_install_menu ;;
diff --git a/install.sh b/install.sh
index 20eaccd1..fab79697 100755
--- a/install.sh
+++ b/install.sh
@@ -43,7 +43,6 @@ source $OMARCHY_INSTALL/development/development.sh
 source $OMARCHY_INSTALL/development/nvim.sh
 source $OMARCHY_INSTALL/development/ruby.sh
 source $OMARCHY_INSTALL/development/docker.sh
-source $OMARCHY_INSTALL/development/firewall.sh
 
 # Desktop
 source $OMARCHY_INSTALL/desktop/desktop.sh
diff --git a/install/development/firewall.sh b/install/development/firewall.sh
deleted file mode 100644
index c04c876b..00000000
--- a/install/development/firewall.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-if [[ -z "${OMARCHY_CHROOT_INSTALL:-}" ]]; then
-  omarchy-install-firewall
-fi
diff --git a/bin/omarchy-install-firewall b/install/first-run/firewall.sh
old mode 100755
new mode 100644
similarity index 74%
rename from bin/omarchy-install-firewall
rename to install/first-run/firewall.sh
index 214cc51c..efd1159f
--- a/bin/omarchy-install-firewall
+++ b/install/first-run/firewall.sh
@@ -1,13 +1,5 @@
 #!/bin/bash
 
-if ! command -v ufw &>/dev/null; then
-  sudo pacman -S --noconfirm ufw
-fi
-
-if ! command -v ufw-docker &>/dev/null; then
-  sudo pacman -S --noconfirm ufw-docker
-fi
-
 # Allow nothing in, everything out
 sudo ufw default deny incoming
 sudo ufw default allow outgoing
diff --git a/migrations/1752709610.sh b/migrations/1752709610.sh
deleted file mode 100644
index 7d1136f0..00000000
--- a/migrations/1752709610.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-echo "Enable ufw firewall"
-source ~/.local/share/omarchy/install/development/firewall.sh