Drop omarchy-limine package; settings now ships limine configs
Pairs with omarchy-pkgs' fold of omarchy-limine into omarchy-settings. Changes: - EARLY_BOOTSTRAP_PACKAGES in phases_impl.py drops omarchy-limine. The limine configs it shipped (mkinitcpio hooks, entry-tool drop-ins, snapper template, default/limine/, default/snapper/) now come with omarchy-settings, which is already in the early bootstrap. - builder/build-iso.sh's offline-mirror seed list and post-mirror filter no longer reference omarchy-limine. - builder/build-omarchy-packages.sh's build queue drops omarchy-limine. - Test manifests (fresh-4.json, fresh-4-semantic.json) no longer expect omarchy-limine in the installed-packages list. The /etc/pacman.d/hooks/ 99-omarchy-limine.hook entry stays — that hook file is generated by the orchestrator regardless, and the filename is descriptive, not tied to the package name.
This commit is contained in:
5 files changed
+13179
-6
No files matched your search
@@ -114,7 +114,7 @@ mapfile -t all_packages < <(
|
||||
grep -hv '^#\|^$' /builder/archinstall.packages
|
||||
# Always include the Omarchy packages so the target install can find
|
||||
# the runtime and companion packages in the offline mirror.
|
||||
printf 'omarchy\nomarchy-settings\nomarchy-limine\nomarchy-nvim\n'
|
||||
printf 'omarchy\nomarchy-settings\nomarchy-nvim\n'
|
||||
} | sort -u
|
||||
)
|
||||
|
||||
@@ -122,7 +122,7 @@ mapfile -t all_packages < <(
|
||||
# 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-limine|omarchy-nvim)$'))
|
||||
all_packages=($(printf '%s\n' "${all_packages[@]}" | grep -vE '^(omarchy|omarchy-settings|omarchy-nvim)$'))
|
||||
fi
|
||||
|
||||
mkdir -p /tmp/offlinedb
|
||||
|
||||
@@ -33,7 +33,6 @@ chown builder:builder "$work_dir"
|
||||
pacman -Sy --noconfirm
|
||||
|
||||
packages=(
|
||||
omarchy-limine
|
||||
omarchy-settings
|
||||
omarchy
|
||||
omarchy-nvim
|
||||
|
||||
@@ -35,15 +35,16 @@ from .ui import info
|
||||
|
||||
|
||||
# Packages installed BEFORE useradd. omarchy-settings and omarchy-nvim populate
|
||||
# /etc/skel so the user's home gets seeded correctly. Target-side setup commands
|
||||
# are installed later by the omarchy runtime package and executed in chroot.
|
||||
# /etc/skel so the user's home gets seeded correctly, and omarchy-settings now
|
||||
# also ships the limine/snapper configs (previously omarchy-limine). Target-side
|
||||
# setup commands are installed later by the omarchy runtime package and executed
|
||||
# in chroot.
|
||||
EARLY_BOOTSTRAP_PACKAGES = [
|
||||
"base-devel",
|
||||
"git",
|
||||
"limine",
|
||||
"efibootmgr",
|
||||
"omarchy-keyring",
|
||||
"omarchy-limine",
|
||||
"omarchy-settings",
|
||||
]
|
||||
|
||||
|
||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
Reference in new issue
Block a user