builder: include omarchy-nvim in local package builds

This commit is contained in:
Ryan Hughes committed 2026-05-22 10:46:56 -04:00
1 parent a21ab8bcb1
commit 3420bc9aa8
2 files changed
+10 -9

No files matched your search

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