Skip to content

Port the Mac three-finger workspace swipe default to quattro - #788

Closed
malik-na wants to merge 2 commits into
quattrofrom
t100-quattro-gestures
Closed

malik-na wants to merge 2 commits into
quattrofrom
t100-quattro-gestures

Conversation

@malik-na

@malik-na malik-na commented Nov 3, 2026

Copy link
Copy Markdown
Member

Fresh installs use quattro (the default branch, and DEFAULT_REF in bin/omarchy-mac-setup), but the swipe from #629 and #633 merged into quattro-upstream, so quattro ships no Mac workspace gesture. This ports both onto quattro's runtime layout: default/hypr/apple-gestures.lua loads from default/hypr/toggles.lua after the user's files, on Apple Silicon only (omarchy-hw-apple). It steps aside for a user's own three-finger sideways gesture, omarchy_workspace_gesture = false turns it off, and it sets workspace_swipe_use_r so the swipe reaches empty workspaces.

Existing installs need no migration: the shipped hyprland.lua already requires default.hypr.toggles, so they pick it up on update.

Differences from the originals: #654 (settings slot) and #631/#660 (platform root) are not on quattro, so use_r stays in the gesture module as in #633. A user's workspace_swipe_use_r = false is therefore overridden while Omarchy's gesture is active; their own gesture or the opt-out is the way out. The Mac manual does not exist on quattro, so the note is in manual/34-keyboard-mouse-trackpad.md.

Related: #339 (touchpad-gestures toggle, off by default) is open against quattro and touches the same manual section and config/hypr/input.lua. This PR does not depend on it.

Test plan

  • New test/shell.d/hyprland-apple-workspace-gesture-test.sh (adapted from the one in Swipe between workspaces with three fingers on Macs by default #629/Swipe into empty workspaces on Macs #633) passes, and fails without the change
  • ./test/all: test/cli passes; test/shell has the same 50 failures as untouched quattro 7cb792e, none new (sandbox: no omarchy-pkgs checkout, read-only mise)
  • omarchy commands --check passes
  • Not tested on a Mac or in a live Hyprland session (the test uses a stub that applies Hyprland 0.56's duplicate-gesture rule). The original PRs report M1/M2 hardware runs on the quattro-upstream layout; this port has not been run on hardware.

malik-na and others added 2 commits November 3, 2026 23:16
Apple Silicon Macs get the three-finger horizontal workspace swipe without
editing input.lua. The default loads after the user's files and steps aside
when the user already set a three-finger sideways gesture, so uncommenting
the input.lua example does not trip Hyprland's duplicate-gesture error.
omarchy_workspace_gesture = false turns it off. x86 keeps no default gesture.

Ported from the merged #629 on quattro-upstream, onto
quattro's runtime layout and its omarchy-hw-apple detection.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Hyprland's workspace swipe steps only through workspaces that exist and never
out of an empty one into a new one, so on a fresh desktop the Mac swipe did
nothing. The Mac gesture now also sets workspace_swipe_use_r, which steps by
number and reaches empty workspaces as Spaces do in macOS. It is set only with
Omarchy's own gesture, so a user's gesture or the opt-out keeps Hyprland's
stepping.

Ported from the merged #633 on quattro-upstream. quattro has
no platform settings slot (#654), so this stays in the gesture module.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
@greptile-apps

greptile-apps Bot commented Nov 3, 2026 •

Copy link
Copy Markdown

RetriggerView in GreptileConfidence Score: 5/5

[Medium impact] The PR appears safe to merge; no actionable defects were established.

Summary

Adds a default three-finger workspace swipe on Apple Silicon Macs.

  • Apple Silicon Macs get a three-finger workspace swipe by default.

malik-na explicitly acknowledged that an active default gesture overrides a user’s workspace_swipe_use_r = false; a custom gesture or the opt-out avoids that override.

No actionable defects were established. Review was based on source inspection; no live Hyprland or hardware verification was performed.

Diagram

%%{init: {'theme': 'neutral'}}%%
flowchart TD
  A[Load helpers and record gestures] --> B[Load user files]
  B --> C[Load Apple gesture module]
  C --> D{Apple Silicon and not opted out?}
  D -->|No| E[Leave gestures unchanged]
  D -->|Yes| F{User has a three-finger sideways gesture?}
  F -->|Yes| E
  F -->|No| G[Enable numbered workspace stepping]
  G --> H[Add default workspace swipe]
Loading

Reviews (1) · Last reviewed commit: "Swipe into empty workspaces on Macs" · Reviewed by Greptile

@malik-na

malik-na commented Nov 3, 2026

Copy link
Copy Markdown
Member Author

Closing this: the gesture default belongs upstream, and upstream already has it. omacom/omarchy quattro has shipped default touchpad gestures for every machine since omacom#16891 (28 Oct): three-finger left/right moves to the previous/next workspace, empty ones included. Per omarchy-mac-pkgs CONTRIBUTING, a gesture change goes upstream and omarchy-mac's quattro-upstream is frozen. Mac users on v4.5.0-rc3 don't have it yet because that tag predates the merge; they get it with the next release.

@malik-na malik-na closed this Nov 3, 2026
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