Repository navigation
Move the Mac's desktop files to the fixed platform root - #660
Merged
Merged
Conversation
The runtime in omacom#13362 reads a platform package's files from /usr/share/omarchy-platform and drops OMARCHY_PACKAGED_PATH. omarchy-mac now ships them there, with displays.conf in place of the runtime's Apple backlight and DDC branches, and keeps identical copies at the old paths so a Mac on today's runtime keeps its binds, key names and cutouts.
maralcbr
marked this pull request as ready for review
September 28, 2026 07:38
This was referenced Sep 28, 2026
3 of 4 tasks
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.
Runtime side: omacom#13362 now carries
/usr/share/omarchy-platform(a47a9be). Retested against a47a9be and quattro-upstream ce75c6f: both runtime-agnostic tests pass on each, the runtime's own hw-display, brightness-display, platform-defaults, key-names and bar-notch tests pass, and the old-layout package still fails on a47a9be (control). Second review re-check: merge-safe.omarchy-mac now ships its desktop files in
/usr/share/omarchy-platform:hypr/defaults/apple.lua,hypr/settings/apple.lua,hypr/gestures/apple-gestures.lua(the late slot is nowgestures/),key-names,display-cutouts.json, and a newdisplays.conf(skip the Touch Bar'sdisplay-pipeand228600000.dsi.0, preferapple-panel-bl,ddc-require-connector-ddc) that replaces the runtime's Apple branches inomarchy-hw-displayandomarchy-brightness-display.Transition: the install script also stages identical regular copies at the five old
/usr/share/omarchy/default/...paths (not links: both runtimes load only regular files), so a Mac on today's runtime keeps its binds, settings, swipe, key names and cutouts. Each runtime reads only its own paths, so nothing loads twice; the settings fallback indefaults/apple.luaresolves in both layouts. Release order: this package ships with or before the runtime that reads the root; that runtime with an older omarchy-mac loses the binds, key names, cutouts, backlight choice and DDC skip. The copies go when old-runtime support ends.Packaging: omacom/omarchy-pkgs#672 (still a draft) adds
provides=('omarchy-platform')andconflicts=('omarchy-platform'); nothing may depend onomarchy-platform. It needs a re-pin at or after this PR's merge.Tests (Arch aarch64 container, non-root):
packages/omarchy-mac/test/all: the files are at the new root as regular files, the legacy copies are identical,displays.conffollows the runtime's grammar with the expected directives.test/shell.d/apple-platform-hooks-test.shandhyprland-apple-workspace-gesture-test.shnow run against either runtime; both pass on this tree (old runtime) and withOMARCHY_TEST_RUNTIMEpointed at the Converge omarchy-mac and omarchy-mx-mac into upstream Omarchy omarchy#13362 checkout (new root, through its test seam). New cases run the runtime's ownomarchy-hw-displayandomarchy-brightness-displayagainst the staged root: Retina panel picked, never the Touch Bar; DDC probed only with a connectorddcnode. The old-layout package fails both on the new runtime, as expected.Design debated before coding (objections applied: provide documented as conflict-only, versioned
LUA_INITcleared,displays.confexercised through both commands). Second review: no correctness defects; comment wrap and doc nits fixed.