Skip to content

Install menu: gate eight x86_64-only rows on omarchy-hw-x86-64 - #11025

Closed
kvnloo wants to merge 5 commits into
omacom:quattrofrom
kvnloo:fix/install-arch-gate-x86-64
Closed

kvnloo wants to merge 5 commits into
omacom:quattrofrom
kvnloo:fix/install-arch-gate-x86-64

Conversation

@kvnloo

@kvnloo kvnloo commented Sep 9, 2026

Copy link
Copy Markdown
Contributor

Summary

Gate eight x86_64-only Install-menu rows on omarchy-hw-x86-64.

Fixes #8645.

The catalog offers packages that cannot exist on aarch64 (ollama, lm-studio, cursor, zed, spotify, dropbox, symfony-cli, edge) because the only guard is installed-presence. Add bin/omarchy-hw-x86-64 ([[ ${OMARCHY_UNAME_M:-$(uname -m)} == x86_64 ]]) and when: gates on those eight rows; presence-disabled stays.

Does not hide 1Password (separate tarball installer).

Testing

  • hw-x86-64-test.sh 3 ok
  • menu-test.sh 122 ok
  • Full shell suite: baseline 8/235 fail vs candidate 8/236 fail, identical pre-existing list, zero new

@kvnloo

kvnloo commented Sep 12, 2026

Copy link
Copy Markdown
Contributor Author

Salvaged into the install/arch leftover wave: #11501

Cherry-picked onto current quattro with original authorship. Please merge #11501 as the tranche and close this head as salvaged.

@kvnloo
kvnloo force-pushed the fix/install-arch-gate-x86-64 branch from a6f934b to f1ab23a Compare September 21, 2026 09:35
@kvnloo

kvnloo commented Sep 22, 2026

Copy link
Copy Markdown
Contributor Author

Salvaged into the fresh re-cut wave: #12932 (salvage/t1-install-arch-recut-20260922 onto current quattro). Unique hunks (bin/omarchy-hw-x86-64 + Install-row when gates + tests) cherry-picked with authorship preserved; omarchy-menu.jsonc auto-merged (x86_64-only Install rows gated; current menu semantics kept). Please close this head as salvaged into that PR (do not merge this one).

@omarchybot omarchybot added bug Something isn't working compatibility Make Omarchy work better on everything! labels Sep 27, 2026
@jdvmi00

jdvmi00 commented Sep 27, 2026

Copy link
Copy Markdown
Contributor

LM Studio publishes an arm64 AppImage, and omacom/omarchy-pkgs#685 builds lmstudio-bin for aarch64. Once that ships, install.ai.lm-studio can drop the x86-64 gate.

@omarchybot

Copy link
Copy Markdown
Collaborator

Reviewed at f1ab23a against quattro. The bug in #8645 is real, but this pull request has two defects at this head, and two other open pull requests gate the same rows, so the choice between them is the maintainer's.

Defects, both verified:

  • bin/omarchy-hw-x86-64 is committed as mode 100644. The menu runs every when: as a command, and a file that isn't executable exits 126, so on a git checkout (omarchy dev link) all seven rows disappear on x86_64 too. On an x86_64 Omarchy worker the guard returned 0 for install.editor.cursor, and test/shell.d/hw-x86-64-test.sh failed with not ok - x86_64 reports as x86_64. Packaged installs escape it only because the omarchy PKGBUILD installs every bin/* with install -Dm755.
  • The architecture list has gone stale since this was opened. The aarch64 databases at pkgs.omarchy.org, read today, carry cursor-bin 3.22.7 in stable, rc and edge, so the Cursor gate hides an app ARM users can install. zed and omazed are in edge aarch64 (not stable or rc yet), so the Zed gate will be wrong as soon as they are promoted. LM Studio goes the same way once Build LM Studio for aarch64 omarchy-pkgs#685 lands. ollama, spotify, dropbox and Edge are in no aarch64 channel, and Arch Linux ARM's extra has none of them, so those four gates are right today.

test/shell.d/menu-test.sh passed (123/123) on the worker. The full suite was not run, because the comparison below decides whether this is the fix to carry forward.

Competing pull requests:

The second opinion was Codex Medium, working from the three diffs and the package facts above. It found the file-mode defect, which I then reproduced on the worker. It agreed that #11691's availability check is the better basis, and that none of the three is right as it stands. Its independence is not guaranteed.

Waiting on the maintainer to choose an approach. The likely shape is #11691's availability check, extended to the rows this pull request covers.

bin/omarchy-hw-x86-64 was 100644 so git checkouts exited 126 and hid every
gated row. Cursor and Zed both ship Linux aarch64 now, so drop those when:
gates; keep Edge/Dropbox/Spotify/Ollama/LM Studio.
@greptile-apps

greptile-apps Bot commented Oct 6, 2026 •

Copy link
Copy Markdown
Contributor

RetriggerConfidence Score: 4/5

[Medium risk] Gates eight install menu rows to x86_64 machines.

The PR appears safe to merge, with a non-blocking request to test the architecture helper's fallback.

Findings

  1. P2 Real-machine checks are untested ▶

Summary

Adds omarchy-hw-x86-64 and uses it to hide five Install rows on other architectures: Edge, Dropbox, Spotify, LM Studio, and Ollama.

  • Keeps the existing installed-app checks.
  • Leaves Cursor, Zed, Symfony, and 1Password ungated.
  • Adds helper tests and updates the menu assertions.
  • Non-blocking feedback: test the helper's real-machine fallback, not only its override.

Reviews (1) · Last reviewed commit: "fix(menu): mark hw-x86-64 executable and..."

Comment on lines +7 to +9
hw_x86_64() {
OMARCHY_UNAME_M="$1" "$ROOT/bin/omarchy-hw-x86-64"
}

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Real-machine checks are untested

Every test sets OMARCHY_UNAME_M, so none exercises the uname -m path used on real machines. A later mistake in that fallback could hide supported Install rows while all three tests still pass. Add cases with the variable unset and empty, using a stub uname that returns x86_64 or aarch64.

@omarchybot omarchybot added verified Omarchy Triage has verified that this issue is ready for final review ready Good to merge labels Oct 7, 2026
@omarchybot

Copy link
Copy Markdown
Collaborator

Re-reviewed at 257fbf8 against quattro. Both defects from the last review are fixed: bin/omarchy-hw-x86-64 is now executable, and the Cursor and Zed gates are gone, since both now have aarch64 builds. Nothing new was found.

What was checked:

  • The five remaining gates are still right today. spotify, dropbox, nautilus-dropbox, microsoft-edge-stable-bin and lmstudio-bin are all arch=('x86_64') in omacom/omarchy-pkgs, and Arch Linux ARM does not build ollama. The LM Studio gate can come off once Build LM Studio for aarch64 omarchy-pkgs#685 lands.
  • The reproduction ran on an x86_64 Omarchy worker. It fed the menu's own guard evaluator (guardScript in shell/plugins/menu/MenuModel.js) with OMARCHY_UNAME_M=aarch64. On quattro, and on this head with the gates reverted, all five rows are offered. At this head they are hidden. On x86_64 every row is still offered, and with the override unset the predicate returns true from the real uname -m.
  • ./test/cli passed. hw-x86-64-test.sh passed 3 of 3, and menu-test.sh passed 123 of 123 on the head and 129 of 129 merged into current quattro. The full shell suite, run on the merge, has the same five failures as quattro alone, none of them in the menu, and no new ones.

The second opinion was Codex Medium. It found no defect at this head and judged the change proportionate. It agreed that this pull request should carry the fix for #8645, and its independence is not guaranteed. It did contribute two other ways to reach the same failure on aarch64, both verified in source: Setup > Defaults > Browser > Edge (setup.default.browser.edge, which runs omarchy-default-browser edge and installs Edge when it is missing), and omarchy-launch-spotify, which opens the Spotify installer when Spotify is absent. Both are older than this change and outside the Install menu that #8645 covers, so they are follow-ups, not something this pull request needs.

Other open pull requests on the same rows:

This one is the oldest, and the only one that covers all five rows #8645 reports. The title and description still say eight rows and name Cursor, Zed and Symfony. The head gates five.

Waiting on the maintainer, including on the order this and #14431 land in.

@omarchybot omarchybot removed ready Good to merge verified Omarchy Triage has verified that this issue is ready for final review labels Oct 10, 2026
@omarchybot

Copy link
Copy Markdown
Collaborator

Re-checked at 257fbf8 against current quattro (04b374a). The head has not moved, but quattro has, and most of what this pull request does has now landed or stopped being right. That is why the verified and ready labels came off. A trial merge conflicts in default/omarchy/omarchy-menu.jsonc and test/shell.d/menu-test.sh.

What changed underneath it:

  • Converge omarchy-mac and omarchy-mx-mac into upstream Omarchy #14431 merged on 2026-10-10 (e1b0e5e). It adds bin/omarchy-hw-x86, the same uname -m == x86_64 test as bin/omarchy-hw-x86-64 here, and gates Edge, Dropbox and Spotify on it, along with Windows, Minecraft and Heroic. Three of this pull request's five gates are now on quattro under the other predicate.
  • Build LM Studio for aarch64 omarchy-pkgs#885 merged on 2026-10-09 and builds lmstudio-bin for aarch64 (arch=('x86_64' 'aarch64'), from the vendor's arm64 AppImage). The LM Studio gate here would now hide an app ARM users can install.
  • That leaves Ollama, and quattro's AGENTS.md speaks to it directly: when a package is missing on one platform, the default is an upstream fix such as an aarch64 build, with the gap left visible meanwhile, and hiding a row is only for things that can't exist there. Ollama ships upstream arm64 Linux builds. Nothing in omacom/omarchy-pkgs builds it yet, and Arch Linux ARM does not either. Make the install entries work where the repo package is missing #11691 takes the other road, installing the AUR's ollama-bin on aarch64 instead of hiding the row.

Nothing was run this time: the change is the same code verified on 2026-10-07, and what is new is the base around it. These conclusions come from reading quattro, the trial merge and the omarchy-pkgs history.

The second opinion was Codex Medium. It reached the same breakdown of the five gates, found no other defect at this head, and judged that porting this now would mean choosing how Ollama should behave on ARM, which is not a mechanical merge. Its independence is not guaranteed.

Waiting on the maintainer. The recommendation is to close this pull request: #14431 and omacom/omarchy-pkgs#885 cover four of the rows #8645 reports. Ollama on aarch64 is better handled as an aarch64 build in omacom/omarchy-pkgs, or by #11691's fallback, than by hiding the row. If the maintainer would rather hide Ollama for now, the port is small: one "when":"omarchy-hw-x86" on install.ai.ollama, the row added to x86OnlyInstalls in menu-test.sh, and omarchy-hw-x86-64 and its test dropped in favour of the helper quattro already has.

@jandrusk

Copy link
Copy Markdown

Author already salvaged this into #12932 (fix: install/arch leftovers). Please close this source head as superseded once #12932 is the review target — don't merge both.

@omarchybot

Copy link
Copy Markdown
Collaborator

Re-checked at 257fbf8 against current quattro (492b883) after the suggestion above to close this as superseded by #12932. The head has not moved, and nothing on quattro changes the last review: Edge, Dropbox and Spotify are already gated there by omarchy-hw-x86, LM Studio is ungated and now has an aarch64 build, and Ollama is still the one open question.

#12932 is not a replacement for this fix on quattro as it stands:

  • It gates Cursor, Zed and LM Studio on omarchy-hw-x86-64. All three have aarch64 builds now, so those gates would hide apps ARM users can install, and its menu-test.sh list pins them.
  • Its Edge, Dropbox and Spotify hunks rewrite the rows quattro already gates under omarchy-hw-x86, and it does not merge cleanly.
  • It bundles the unrelated omarchy-root-btrfs-extra-luks reboot-warning work from Warn when root Btrfs spans extra LUKS devices the initramfs cannot unlock #11023.

Nothing was run. These conclusions come from reading the two diffs against quattro. The second opinion was Codex Medium, and it reached the same conclusions on all three points. Its independence is not guaranteed.

Still waiting on the maintainer. The recommendation is unchanged: close this pull request rather than fold it into #12932. #14431 and omacom/omarchy-pkgs#885 already cover four of the five rows #8645 reports. Ollama on aarch64 needs a decision of its own.

@birkskyum

Copy link
Copy Markdown
Contributor

Thanks @kvnloo. Closing this one. #8645 is closed, the packages it gates are published for aarch64 now, Edge is hidden off x86, Spotify installs as a web app on ARM, and #15753 hides the Install rows that can't work there. The Btrfs part goes on in #12932.

@birkskyum birkskyum closed this Oct 18, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bug Something isn't working compatibility Make Omarchy work better on everything!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Install menu offers x86_64-only packages on aarch64: every entry fails with target not found in a floating terminal that closes

5 participants