From 3420bc9aa81200ab591d1daa54c4c44302d91aa8 Mon Sep 17 00:00:00 2001
From: Ryan Hughes <ryan@heyoodle.com>
Date: Fri, 22 May 2026 10:46:56 -0400
Subject: [PATCH] builder: include omarchy-nvim in local package builds

---
 builder/build-iso.sh              | 14 +++++++-------
 builder/build-omarchy-packages.sh |  5 +++--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/builder/build-iso.sh b/builder/build-iso.sh
index 64e0605..d652162 100755
--- a/builder/build-iso.sh
+++ b/builder/build-iso.sh
@@ -93,17 +93,17 @@ mapfile -t all_packages < <(
     cat "$build_cache_dir/packages.x86_64"
     grep -hv '^#\|^$' "${base_pkg_lists[@]}"
     grep -hv '^#\|^$' /builder/archinstall.packages
-    # Always include the omarchy meta-packages so the target install can find
-    # omarchy-installer in the offline mirror.
-    printf 'omarchy\nomarchy-settings\nomarchy-installer\nomarchy-limine\n'
+    # Always include the omarchy packages so the target install can find
+    # omarchy-installer and companion packages in the offline mirror.
+    printf 'omarchy\nomarchy-settings\nomarchy-installer\nomarchy-limine\nomarchy-nvim\n'
   } | sort -u
 )
 
-# With --local-source we already built the four omarchy* packages directly
-# into the mirror; strip them from the pacman -Syw list so it doesn't try to
-# fetch the published versions on top.
+# With --local-source we already built these omarchy* packages directly into
+# the mirror; strip them from the pacman -Syw list so it doesn't try to fetch
+# the published versions on top.
 if [[ -n ${LOCAL_OMARCHY_BUILD:-} ]]; then
-  all_packages=($(printf '%s\n' "${all_packages[@]}" | grep -vE '^(omarchy|omarchy-settings|omarchy-installer|omarchy-limine)$'))
+  all_packages=($(printf '%s\n' "${all_packages[@]}" | grep -vE '^(omarchy|omarchy-settings|omarchy-installer|omarchy-limine|omarchy-nvim)$'))
 fi
 
 mkdir -p /tmp/offlinedb
diff --git a/builder/build-omarchy-packages.sh b/builder/build-omarchy-packages.sh
index 0ebb394..69858cf 100755
--- a/builder/build-omarchy-packages.sh
+++ b/builder/build-omarchy-packages.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-# Build omarchy + omarchy-settings + omarchy-installer + omarchy-limine from
-# mounted source (/omarchy-installer + /omarchy-pkgs) and drop the .pkg.tar.zst
+# Build omarchy + companion omarchy packages from mounted source
+# (/omarchy-installer + /omarchy-pkgs) and drop the .pkg.tar.zst
 # files into the offline-mirror directory passed as $1.
 #
 # Run inside the ISO build container (build-iso.sh sources this).
@@ -48,6 +48,7 @@ packages=(
   omarchy-settings
   omarchy
   omarchy-installer
+  omarchy-nvim
 )
 
 for pkg in "${packages[@]}"; do