Repository navigation
Conversation
The migration engine now does the runtime's Apple repair migrations on every converted Mac and keeps failed user setup pending until it succeeds.
72bfdbb17 adds the required setup-boot and update-takeover entrypoints on top of the engine repairs.
c446c8df4 moves the Mac's desktop defaults into omarchy-mac's platform hooks on top of 72bfdbb17.
This was referenced Sep 28, 2026
Collaborator
Author
|
Superseded by #789, which builds omarchy-mac and omarchy-mac-boot from omacom/omarchy-mac-pkgs and carries this PR's depends and publish-order notes. |
gentlemanSoup
pushed a commit
to gentlemanSoup/omarchy-pkgs
that referenced
this pull request
Oct 4, 2026
Both recipes pin omacom/omarchy-mac-pkgs main 4399105 and stage the top-level omarchy-mac/ and omarchy-mac-boot/ directories, each tested from its own copy. omarchy-mac 0.1.0-11 and omarchy-mac-boot 20261004-1 sort above edge and every lab candidate. They carry the depends and the platform-root provide from omacom#672 and omacom#673 and drop the migration engine, legacy files and the Apple setup core now owns.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Draft, held. Publishes with the next candidate set: re-pin
_committo that set's source commit (pkgver follows its UTC date) before merging, together with omarchy-mac (#672) from the same commit.Re-pins
omarchy-mac-boot(first c446c8df4 as 20260927-2, now aaae2cddb as 20260928-1; master has ff7ce0d4d as 20260927-1). It carries ticket 103 step 3 (omacom/omarchy-mac#628): the migration engine's defaults step does the runtime's Apple repair migrations on every converted Mac (Snapper root config,alarmout of wheel, the Intel Broadcom block, UTF-8 locale, fnmode handover, recovery-key reset arming), and failed user setup stays inuser-pendingand reruns at every run and boot;omarchy-mac-migrate-verify.servicestarts on eitherreboot-pendingoruser-pending.It also ships the required
setup-boot(#635; the runtime from that commit on calls it, so this package publishes with or before that runtime) andupdate-takeover(#636, for upstream's step 6) entrypoints. No new files outside the boot payload and no ownership changes.dependsadds what the boot chain can't lose:m1n1(virtual; the image and the migration installm1n1-aurora),uboot-asahi(update-m1n1 builds stage 2 from both) andasahi-alarm-keyring(first boot populates it). The image's full package set resolves to the same 944 packages as before.Tested:
makepkg -f -din an aarch64 Arch container, check() 288/288; the built unit carries both conditions and the engine the repairs. Not installed on a test Mac (the M2's boot package is left alone).Release order (owner decision 2026-09-28, recovery key dropped): the re-pin must take an omarchy-mac commit that includes omacom/omarchy-mac#657, whose boot check accepts an owner-only disk (one keyslot). This package must publish with or before any runtime that stops adding the recovery key (omacom/omarchy#13362, or omarchy-mac quattro-upstream from #657 on); an older boot check fails an owner-only disk after setup. #657 also drops the engine's recovery-reset arming, so the body above no longer applies to that repair.
Release order (luks-slots --owner): the re-pin must also include omacom/omarchy-mac#659. Upstream omarchy-drive-password (#13362) will call
sudo omarchy-lifecycle-dispatch luks-slots --ownerbefore any change, and an older luks-slots refuses--owneras an unknown argument. So this omarchy-mac-boot must publish with or before that runtime.Re-pinned to omacom/omarchy-mac aaae2cddb (quattro-upstream with #658). Proof (M1, lab set apple-test-aaae2cddb33c-20260928): image built from that runtime with omarchy-mac 0.1.0-8 and omarchy-mac-boot 20260928-1; inspection passed and the offline first-boot probe made no pacman request. In the image, vulkan-asahi, rtkit, pipewire-alsa, pipewire-pulse and speakersafetyd are installed only as dependencies. alsa-ucm-conf-asahi, asahi-audio, asahi-alarm-keyring, m1n1-aurora and uboot-asahi are also required by omarchy-mac or omarchy-mac-boot. The removable defaults have no Mac package depending on them. The offline VM first-boot scenario passed.