Skip to content

Move the Mac's desktop files to the fixed platform root - #660

Merged
maralcbr merged 2 commits into
quattro-upstreamfrom
mac/111-platform-root
Sep 28, 2026
Merged

maralcbr merged 2 commits into
quattro-upstreamfrom
mac/111-platform-root

Conversation

@maralcbr

@maralcbr maralcbr commented Sep 28, 2026 •

Copy link
Copy Markdown
Member

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 now gestures/), key-names, display-cutouts.json, and a new displays.conf (skip the Touch Bar's display-pipe and 228600000.dsi.0, prefer apple-panel-bl, ddc-require-connector-ddc) that replaces the runtime's Apple branches in omarchy-hw-display and omarchy-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 in defaults/apple.lua resolves 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') and conflicts=('omarchy-platform'); nothing may depend on omarchy-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.conf follows the runtime's grammar with the expected directives.
  • test/shell.d/apple-platform-hooks-test.sh and hyprland-apple-workspace-gesture-test.sh now run against either runtime; both pass on this tree (old runtime) and with OMARCHY_TEST_RUNTIME pointed 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 own omarchy-hw-display and omarchy-brightness-display against the staged root: Retina panel picked, never the Touch Bar; DDC probed only with a connector ddc node. The old-layout package fails both on the new runtime, as expected.
  • Every other shell test that stages omarchy-mac or reads the platform files (40 files) passes.

Design debated before coding (objections applied: provide documented as conflict-only, versioned LUA_INIT cleared, displays.conf exercised through both commands). Second review: no correctness defects; comment wrap and doc nits fixed.

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.
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