Repository navigation
Clean up Ally shell writes, TDP wake, and dead packaging - #80
DanielJBurbridge merged 2 commits into
Conversation
Stop the keyboard setup from rewriting shell.json, install the greeter keyboard package only on an Ally, and leave wake TDP reassert to the resume unit. Make the earlier power-button migration a no-op, drop the unused TDP package, and pin the gaming-session checksums. Model: grok-4.7 Co-authored-by: Daniel Burbridge <DanielJBurbridge@users.noreply.github.com>
DanielJBurbridge
left a comment
There was a problem hiding this comment.
dev-red review: FAIL at 3f1222e
Blocker B1 (Tests are red, and it's a non-handheld regression): Actions test fails on test/shell.d/desktop-keyboard-test.sh. It reproduces locally. On a machine that isn't an Ally (rog-laptop case), omarchy-setup-rog-ally-keyboard now prints The shell is not running, so the Keyboard button stays on the bar. Drop it the next time the shell runs: omarchy plugin disable omarchy.desktop-keyboard (hardware_acceptance, test/helpers/desktop-keyboard-process.py:100). The old strip_keyboard_widget did nothing when there was no button. The new --remove / non-RC71L path tells every machine to remove a button that was never added. Say it only when the button is actually on the bar: a read-only jq check of shell.json is fine, because reading isn't writing. Or say it only when this setup's launcher was installed. Keep A7's "never write shell.json".
Everything else checks out:
- A9: the shim no longer subscribes to
PrepareForSleep, and pkexec is--setonly.omarchy-ally-tdp-resume.service(ExecStop=... --reassert,WantedBy=sleep.target) is installed and enabled byinstall_hardware, so wake reassert still happens without the session. - A8: the
1794830400hardware gate is fine, since the package stays in base for every greeter. A10:1795075200is a no-op, and1794843321is the one catch-up. packaging/is gone. The only references left are the test asserting it isn't shipped. The TdpLimit1 XML andNOTICE.steamos-managerare still indefault/ally-tdp/, so the MIT attribution is kept.- The PKGBUILD's 7 sha256sums match the files at this head.
iproute2is in depends, so L155 is right. - There's a Model trailer (grok-4.7), and no follow-up lines are removed except edits to L155 and L190.
- Low (fix with B1): L200 and HANDOFF still say
omarchy-gaming-session1.0.0-5. Make it "1.0.0-5 or later", so a 1.0.0-6 deploy plainly follows the onepacman -Urule.
A delta check is next: the B1 fix, the 1.0.0-5 wording and green Tests.
A stopped shell stays quiet unless the button is already in shell.json or this setup's launcher was installed. L200 and the handoff cover gaming-session 1.0.0-5 or later. Model: grok-4.7 Co-authored-by: Daniel Burbridge <DanielJBurbridge@users.noreply.github.com>
DanielJBurbridge
left a comment
There was a problem hiding this comment.
dev-red delta review: PASS at 84ebcb0
- B1 is fixed. The shell-down note now only names the button when
keyboard_button_in_shell(a read-onlyjq -e, where missing or invalid JSON counts as no button) finds it, or when this setup installed the launcher. Nothing writesshell.json.desktop-keyboard-testpasses locally. - L200 and HANDOFF now say "1.0.0-5 or later".
- Integ e742281 is an ancestor of this head. The new commit has a
Model: grok-4.7trailer. - Actions
testandi18n-checkare both green on this head.
Low follow-up (not blocking): keyboard_button_in_shell reads $HOME/.config and ignores XDG_CONFIG_HOME, which the removed helper honoured.
Cleared to merge at this sha.
a1fc4bb
into
feat/ally-parity-integration-20261111
What changes
Cleanup from the integ audits. No Ally deploy, and
shell/plugins/lockis untouched.omarchy-setup-rog-ally-keyboardno longer rewrites~/.config/omarchy/shell.json.--remove, and a run that is not an RC71L, drop the bar button withomarchy-plugin-disablewhile the shell is up. If the shell is down, the layout is left alone. The command says to drop the button the next time the shell runs only when that button is already inshell.json(a read-only check) or this setup's launcher was installed. Otherwise it stays silent.migrations/1794830400.shinstallsqt6-virtualkeyboardonly whenomarchy-hw-rog-allysucceeds. The stamp is still1794830400. The package stays ininstall/omarchy-base.packagesbecauseetc/sddm.conf.d/10-wayland.confsetsGreeterEnvironmentfor every machine's greeter, so a fresh laptop install still needs it.omarchy-ally-tdp-resume.serviceExecStop. The shim no longer subscribes to logindPrepareForSleep.migrations/1795075200.shis a no-op.1794843321is the catch-up. The hardware leaf andomarchy-setup-gaming-sessionremain the retry.packaging/rog-ally-tdp/is removed. The shim reads$OMARCHY_PATH/default/ally-tdp/, and the hardware leaf already runsomarchy-ally-tdp-install.packaging/is gone. The gaming-session install scriptlet still runsomarchy-ally-tdp-install sessionas the packaged-install fallback. It does not install the deleted package.omarchy-gaming-sessionis 1.0.0-6.sha256sumsare the local files, anddependsincludesiproute2(ssindefault/gaming/steam-ready.sh). L155 is fixed. L200 and the handoff name the sudoers package asomarchy-gaming-session1.0.0-5 or later.L210–L219 is claimed and empty. Nothing from this cleanup was left open.
Model: grok-4.7
Verification
bash test/shell.d/hw-rog-ally-test.shpassed, including noshell.jsonwrite when the shell is down, a quiet removal when the button was never added, a note when the layout or this setup's launcher has it, noqt6-virtualkeyboardinstall off the Ally, and1795075200as a no-op.bash test/shell.d/ally-tdp-test.shpassed, including the shim having no on-sleep reassert and the vendored interface living only indefault/ally-tdp/.bash test/shell.d/handheld-autologin-test.shpassed, including noSKIPin the gaming-session PKGBUILD,iproute2independs, and checksums matching the local files.Screenshots
No visible change: this is command, migration, and package cleanup. The bar button is still removed through the shell when it is running.