Skip to content

Pin omarchy-mac to the Apple setup it took over (0.1.0-7) - #672

Closed
maralcbr wants to merge 8 commits into
masterfrom
mac/103-omarchy-mac-depends
Closed

maralcbr wants to merge 8 commits into
masterfrom
mac/103-omarchy-mac-depends

Conversation

@maralcbr

@maralcbr maralcbr commented Sep 27, 2026 •

Copy link
Copy Markdown
Collaborator

Draft, held. Publishes only with the matching runtime: tie it to the next candidate set built from omacom/omarchy-mac e528093bf or later, and re-pin _commit to that set's source commit before merging.

Re-pins omarchy-mac to 49c01e2dd (omacom/omarchy-mac#660 merge) as 0.1.0-8, above the lab 0.1.0-7 built from c446c8df4 (master published 0.1.0-6 at ff7ce0d4d via #666). It carries the platform root move (#660) and ticket 103 steps 4.1 and 4.3 (omacom/omarchy-mac#630, #631), Steam FEX setup (#634) the step 6 app hooks post-install/pre-remove (#636) and the Mac's desktop defaults in the platform hooks (#639: early/late Hyprland defaults, key names, notch cutouts): omarchy-mac's own Electron, trackpad and browser-flag setup, its /usr/lib/omarchy/mac setup entrypoints, the Apple pacman templates, the three-finger workspace swipe, and the omarchy-hw-apple alias.

  • depends carries what every Mac needs, so it can't be removed and an offline first boot has it: the speaker stack with speakersafetyd named (its unit is this package's preset), alsa-ucm-conf-asahi, rtkit, pipewire-alsa, pipewire-pulse, vulkan-asahi and asahi-alarm-keyring (its pacman templates configure [asahi-alarm]). avd-fw, libva-v4l2_request-avd, wf-recorder and widevine stay out: they are removable defaults in the runtime's Apple list (Shrink the Apple list to the Mac packages and removable defaults omarchy-mac#658, upstream Converge omarchy-mac and omarchy-mx-mac into upstream Omarchy omarchy#13362), so this package ships with or before the runtime that shrinks that list; a shrunk list with an older omarchy-mac would lose vulkan-asahi. All resolve on edge + ALARM; the image's full package set resolves to the same 944 packages as before.
  • One transaction: /usr/bin/omarchy-hw-apple and /usr/share/omarchy/bin/omarchy-hw-apple move from the quattro-upstream runtime to this package. The runtime and omarchy-mac must upgrade together from the same set; this package alone over an older quattro runtime stops on a file conflict, and the runtime alone drops the alias (README).

Tested: makepkg -f -d in the aarch64 builder image at 49c01e2dd, check() 93/93, .PKGINFO has the provide and conflict, both the platform root and the old-path copies are in the package. An earlier lab build of the 4.1 commit installed and ran on the M2, then was rolled back.

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.

omarchy-mac now carries the Apple desktop setup the runtime's leaves did,
so it also depends on the video decoder's firmware and VA-API driver and on
wf-recorder, which those leaves used to install. The legacy detector alias
moves to it from the runtime, so both upgrade in one transaction.
@maralcbr
maralcbr force-pushed the mac/103-omarchy-mac-depends branch from 1e6b3a6 to 52f52fb Compare September 27, 2026 14:03
@maralcbr maralcbr changed the title Pin omarchy-mac to the Apple setup it took over Pin omarchy-mac to the Apple setup it took over (0.1.0-7) Sep 27, 2026
@maralcbr
maralcbr marked this pull request as draft September 27, 2026 14:03
Asahi's 16K-page Widevine CDM moves from a runtime migration to the Apple
add-on's dependencies.
72bfdbb17 adds post-install and pre-remove, Steam's FEX launcher setup
and the workspace swipe on top of e528093bf.
c446c8df4 moves the Mac's desktop defaults into omarchy-mac's platform
hooks on top of 72bfdbb17.
@maralcbr

maralcbr commented Oct 4, 2026

Copy link
Copy Markdown
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.

@maralcbr maralcbr closed this Oct 4, 2026
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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant