Repository navigation
Conversation
omarchy-mac-boot's drop-ins now add to the platform baseline from 00-omarchy-hooks.conf and do nothing unless omarchy-hw-platform says apple-silicon, so the package cannot change a Qualcomm, generic aarch64 or x86 initramfs. The baseline already puts plymouth after systemd on Apple, so 93-omarchy-mac-plymouth.conf goes, and 94- no longer bundles vconsole.conf, which omarchy_hooks.conf already does for Latin layouts.
The runtime leaf wrote apple_hid_modules.conf next to omarchy-mac-boot's 92-omarchy-mac-hid.conf, which already early-loads both drivers. With the boot package's drop-in present the leaf and its migration now write nothing, so the modules have one writer.
mkinitcpio runs with PATH=/usr/bin:/bin, so the gated drop-ins only see the test's stand-in there.
omarchy-mac-boot only installs on Macs, and a runtime older than omarchy-hw-platform must not lose asahi, the firmware hooks and sd-encrypt on the next rebuild, so an absent detector keeps the Apple behaviour. A detector that cannot place the machine now stops the build, as the baseline does, instead of quietly leaving the Apple hooks out. The comments no longer imply that mkinitcpio.conf's busybox line reaches 91-, and the composition test covers a local busybox line instead of a machine without the runtime.
This was referenced Sep 25, 2026
The merged baseline keeps a Mac's own HOOKS when they carry the asahi hook, off a Mac too (a chroot or a VM), and keeps a legacy cryptdevice= Mac's busybox line. The Apple drop-ins now follow the same marker, so such a root keeps its unlock hooks and modules on a rebuild, and the composition test covers both cases against the merged baseline.
The asahi-root case now starts from a line that has the firmware hook, so the test does not assert that 90- leaves omarchy-vendorfw out when asahi is already there.
maralcbr
added a commit
to omacom/omarchy-pkgs
that referenced
this pull request
Sep 25, 2026
…n it From omacom/omarchy-mac#544 the Apple drop-ins no longer add Plymouth themselves and build on omarchy-settings' 00-omarchy-hooks.conf (#536). A settings version cannot express that (quattro candidates sort below stock releases and omarchy pins its settings exactly), so a build whose payload has no 93-omarchy-mac-plymouth.conf depends on the name omarchy-mkinitcpio-hooks-baseline, which settings packages that ship the baseline must provide.
APS6
pushed a commit
to APS6/omarchy-pkgs
that referenced
this pull request
Sep 26, 2026
…n it From omacom/omarchy-mac#544 the Apple drop-ins no longer add Plymouth themselves and build on omarchy-settings' 00-omarchy-hooks.conf (omacom#536). A settings version cannot express that (quattro candidates sort below stock releases and omarchy pins its settings exactly), so a build whose payload has no 93-omarchy-mac-plymouth.conf depends on the name omarchy-mkinitcpio-hooks-baseline, which settings packages that ship the baseline must provide.
APS6
pushed a commit
to APS6/omarchy-pkgs
that referenced
this pull request
Sep 26, 2026
A pin with omacom/omarchy-mac#544 needs the settings HOOKS baseline (omacom#542) published first; a pin with omacom#543's update-verify entrypoint must publish before any runtime carrying omacom#543. pkgrel 3 so this rebuild does not reuse the published 20260925-2 filename.
This branch has not been deployed
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
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.
Ticket 16 of the Apple Silicon convergence plan, against
quattro-upstream(which now carries #527's boot package source, the composable HOOKS baseline #536, the runtime settings profile #542 and the image-target detector #546).omarchy-mac-boot's mkinitcpio drop-ins now build on the baseline in
00-omarchy-hooks.confand act only on Apple Silicon:90-(asahi, omarchy-vendorfw),91-(omarchy-mac-encrypt, sd-encrypt),92-(HID and Thunderbolt modules) and94-(sd-vconsole guard for non-Latin layouts) change nothing unlessomarchy-hw-platformsaysapple-siliconor HOOKS already carryasahi.asahiis the same marker the baseline uses for a Mac's own line, including off a Mac such as in a VM.93-omarchy-mac-plymouth.confand its ALPM trigger are gone: the Apple baseline already has plymouth after systemd.94-no longer adds/etc/vconsole.confto FILES.omarchy_hooks.confbundles it for Latin layouts (it was listed twice on the baseline), and sd-vconsole bundles it itself.fix-asahi-hid-race.sh, and migration 1788200001 which sources it, write noapple_hid_modules.confwhen92-is installed, so the HID modules have one writer. Macs that already have the file keep it; the duplicate entries are harmless.Testing
test/shell.d/mac-initramfs-compose-test.shcomposes omarchy-settings' and omarchy-mac-boot's drop-ins the way mkinitcpio does, on detector fixtures:base systemd plymouth autodetect microcode modconf kms keyboard sd-vconsole block asahi omarchy-vendorfw omarchy-mac-encrypt sd-encrypt filesystems fsck. The mx-mac values were read on the M2 Max (omarchy-mac-boot 20260921-10, mkinitcpio 42). Land #503 with the review fixes and the gap-audit merge blockers #527's drop-ins fail this test, because vconsole.conf is bundled twice.cryptdevice=Mac's busybox line (kept) and anasahiroot off a Mac (keeps its unlock hooks).return 1, treating a missing detector as non-Apple, or removing theasahimarker.mkinitcpio.conf,vconsole.confand asahi hook.omarchy_hooks.conf,thunderbolt_module.conf, these drop-ins, with and withoutapple_hid_modules.conf). Same build hooks, and the same files byte for byte apart from/configandmodules-load.d/MODULES.conf, which list the same modules with different duplicates./buildconfig.packages/omarchy-mac/boot/test/allstandalone as a non-root user in an Arch Linux ARM container: all pass. The real-image sections of the HID and vconsole tests pass. They now install the detector stand-in in/usr/bin, because mkinitcpio runs withPATH=/usr/bin:/bin.test/all, non-root, Arch Linux ARM container): 325 of 332 files pass. The 7 failures areconfig-test,hermes-remove,hw-hybrid-gpu,legacy-power-udev-rules-migration,platform-packages,snapperandunowned-system-paths. All of them also fail on the base branches in the same container.quattro-upstream.Second review: the first round found that a runtime without the detector would lose the Apple hooks, and that a failing detector read as "not a Mac"; both are fixed. The second round found no regression on Apple or elsewhere. Its remaining findings: two test gaps (fixed), and the packaging dependency below.
Follow-ups
93-gone, Plymouth at the prompt comes only from omarchy-settings'00-omarchy-hooks.conf, and vconsole.conf on a legacy busybox line only from itsomarchy_hooks.conf. So omarchy-mac-boot's next re-pin adds a dependency onomarchy-mkinitcpio-hooks-baseline(omarchy-mac-boot 20260925-3: re-pin to quattro-upstream f7ea7ecc omarchy-pkgs#641), and no published omarchy-settings provides that yet. This change must not reach a published omarchy-mac-boot until an omarchy-settings package providing it is on edge for aarch64.thunderbolt?in a systemd initramfs (Runtime settings profile and platform package lists #542). mkinitcpio's systemd hook writes MODULES verbatim to/etc/modules-load.d/MODULES.conf, so settings'MODULES+=(thunderbolt?)adds athunderbolt?line that systemd-modules-load cannot resolve. On Macs the module is loaded anyway through92-, but the initrd's modules-load unit can log a failure. This is outside this ticket; it affects any systemd HOOKS line.