Repository navigation
Move the Mac's desktop defaults into omarchy-mac's platform hooks - #639
Merged
Merged
Conversation
Omarchy's Hyprland config, keybindings menu and bar now read a platform package's defaults from the packaged tree, as upstream's step 6 does: Hyprland defaults before Omarchy's and after the user's files, key names, and the panels' camera cutouts. omarchy-mac fills them with the Mac's lid switch, capture chords, keyboard backlight chords, trackpad default, menus on the built-in screen, F1/F2 names and notch sizes, which leave the shared files. The workspace swipe no longer depends on a helper upstream lacks.
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.
Ticket 103, step 6 "what omarchy-mac must ship". Upstream's step 6 (omacom#13362, local 7fabb9b) gives only platform-neutral hooks; this ports them to quattro-upstream and fills them from omarchy-mac, so one package gives a Mac on quattro-upstream and a Mac on upstream + step 6 the same behaviour.
default/hypr/platform/defaults/*.lua(chord takeover, bind decorators) and latedefault/hypr/platform/*.lua, read from the packaged tree; key namesdefault/omarchy/platform/key-namesin the keybindings menu; display cutoutsdefault/shell/platform/display-cutouts.jsonfor the bar's notch floor. Shared files lose their Apple branches (lid switch, capture chords,omarchy-brightness-shift, tap-to-click devices, built-in-screen focus, F1/F2 names, notch table). Bar.qml keepsappleSiliconHostonly for the microphone widget and audio panel (no seam yet).defaults/apple.lua(trackpad, SMC lid, capture chords, Shift+brightness on the keyboard backlight, menus on the built-in screen),apple-gestures.luafixed (it relied ono.apple_silicon, which upstream lacks, so the swipe silently skipped there),key-names,display-cutouts.json.Differences from before: Shift+brightness binds are described as "Keyboard brightness up/down" (same action); an unlisted notched panel gets no floor (all shipping M1/M2 panels are listed).
Tests: new
apple-platform-hooks-test.shand the reworked gesture test pass against this runtime and the step 6 worktree (OMARCHY_TEST_RUNTIME); ported fkeys, binding-conflicts, bar-notch, input-default, hw-laptop, fnmode tests; package suite green. Full runtime suite: only the usual environment failures.M2 (live session, files deployed then restored): binds identical except the Shift+brightness description; lid (SMC) and capture chords bound; bar 32 px on eDP-1;
hyprctl evalshows the swipe registered, the focus decorator active ando.apple_siliconnil; F1/F2 names in the keybindings menu; no config errors.Debated (README notch claim fixed) and reviewed (re-homed test cases, README accuracy fixed); no blockers.