Repository navigation
Conversation
…k, as on Dakota Dakota builds Ghostty natively (bluefin/ghostty.bst) and ships no Ptyxis. Utah now installs the factory's ghostty RPM (utah-packages#1154, on Zig 0.17 from #1152) and drops: - ptyxis - the TunaOS Flatpak remote and ghostty.preinstall - the 30-ghostty.sh user hook that pointed the Flatpak's per-app config at ~/.config/ghostty (native Ghostty reads it directly), and its tests - the live ISO's TunaOS Ghostty install The LUKS e2e opens the native binary (TERMINAL_CMD, overridable) instead of `flatpak run`. Ctrl+Alt+T stays on xdg-terminal-exec, and the skel config keeps Dakota's light/dark theme. Blocked on the factory publishing ghostty. Closes #1223 Assisted-by: Claude Opus via GitHub Copilot Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: danathar, hanthor The full list of commands accepted by this bot can be found here. Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
eae6dbd
ℹ️ Sentinel notice — informational; author is trusted (owner), merge is not blockedHive flagged this PR (author @hanthor, head
Hive did not add the |
|
@hanthor this PR is back in your court ( Failing checks:
Reply here or push a new head to this branch (same sign-off); CI and the review swarm re-run automatically and the PR returns to the normal path. Queued in your relay fix queue (11 waiting): fixes are handed out before new work as soon as you have capacity. |
Danathar
left a comment
There was a problem hiding this comment.
Stand-in review (the hive's reviewers are out of quota). Approving; don't merge until utah-packages#1152, #1154 and #1147 publish zig, ghostty and gtk4-layer-shell. The red contract is only check-repos on packages not in the stack's old pin 523507b8; rebase onto #1248/#1309. With Ptyxis gone, xdg-terminal-exec falls back to the installed TerminalEmulator entry (Common's gnome-xdg-terminals.list lists only Ptyxis), as on Dakota, so Ctrl+Alt+T opens native Ghostty. Common's Ptyxis dconf and gschema overrides go inert without breaking the build, and no ujust recipe references ptyxis. Utah runs the smoke and common suites, and the @ptyxis scenario auto-skips when the app is absent. Non-blocking:
- Existing users who have the Ghostty Flatpak keep it, since it's only dropped from the preinstall list. Both share the app ID
com.mitchellh.ghostty, and Flatpak exports come first inXDG_DATA_DIRS, so those users keep launching the Flatpak; a one-time uninstall or a release note would finish the swap. docs/skills/desktop-contract.md:71still mentions the TunaOS remote and the Ghostty preinstall.- Consider a contract entry for
/usr/bin/ghostty.
Not boot-tested.
There was a problem hiding this comment.
Summary: This change makes Utah ship the Ghostty terminal as a normal system program, the way Dakota does, and removes the older Ptyxis terminal and the separately downloaded (Flatpak) copy of Ghostty. New installs look right. But computers that already have Utah keep the old downloaded Ghostty after updating, and it stops getting updates. It can also hide the new built-in Ghostty, so the terminal shortcut may open the old, frozen copy. A few docs still describe the old setup.
What I need from you: Add a one-time cleanup that removes the old Ghostty Flatpak, and refresh the three stale doc lines.
Reviewed head eae6dbd. The contract CI job on this head fails in check-repos with No match for argument: ghostty, along with many packages from the stack below. That matches the PR body: this is blocked until the factory publishes Ghostty. It is not a new defect.
correctness
- Upgraded systems keep an orphaned Ghostty Flatpak that can shadow native Ghostty (medium). The PR deletes
etc/flatpak/remotes.d/tuna-os.flatpakrepoandghostty.preinstall, but nothing uninstalls thecom.mitchellh.ghosttyFlatpak that earlier images installed. The privileged hooks at head are05-bootupctl-adopt.shthrough99-flatpaks.sh, and none of them removes a Flatpak (99-flatpaks.sh:16-34only handles Firefox prefs). Once the remote file is gone, that install has no origin to update from. It also exports the same desktop ID as the native package. Flatpak's export dirs come before/usr/shareinXDG_DATA_DIRS, so on an upgraded machine the stale Flatpak most likely wins the launcher entry and thexdg-terminal-execlookup. I inferred that last point from standard Flatpak behavior and did not test it on an image. Fix: add a one-shot privileged hook, and add it tocontracts/bluefin-desktop.tomlif hooks are enumerated there:
--- /dev/null
+++ b/system_files/shared/usr/share/ublue-os/privileged-setup.hooks.d/30-ghostty-flatpak-retire.sh
@@
+#!/usr/bin/bash
+# Native Ghostty replaced the TunaOS Flatpak (#1223). Machines installed before
+# that keep the Flatpak, now with no remote to update from, and its exported
+# com.mitchellh.ghostty.desktop shadows the native one. Remove it once.
+# shellcheck source=/dev/null
+source /usr/lib/ublue/setup-services/libsetup.sh
+if ! declare -F version-script-check >/dev/null; then
+ version-script-check() { version-script "$@"; }
+ version-script-commit() { :; }
+fi
+version-script-check ghostty-flatpak-retire privileged 1 || exit 0
+set -euo pipefail
+if flatpak info --system com.mitchellh.ghostty >/dev/null 2>&1; then
+ flatpak uninstall --system --noninteractive com.mitchellh.ghostty
+fi
+version-script-commit ghostty-flatpak-retire privileged 1User config is safe: the retired 30-ghostty.sh already moved it to ~/.config/ghostty, which native Ghostty reads.
docs-currency
- Three places still describe the TunaOS Flatpak (low).
docs/skills/desktop-contract.md:71still lists "the Flathub and TunaOS remotes, the Bazaar, Ghostty and BudsLink preinstalls". This PR removes both the TunaOS remote and the Ghostty preinstall from the contract.- **`[flatpak]`** — first-boot policy: the Flathub remote, the Bazaar and BudsLink preinstalls, the `99-flatpaks.sh` hook, and the system-flatpaksbaselines/triage.toml:20(andbaselines/GAP.md:121, if that file is generated from it) still says "Utah installs the tuna-os Flatpak". Follow thekanataprecedent on line 19:ghostty = { status = "planned", area = "desktop-apps", issue = "#1223", reason = "Installed from the factory in place of Ptyxis and the tuna-os Flatpak; gap closes on the next baseline" }
No findings from: security, intent-alignment, style. The Ptyxis removal, the luks-e2e switch to TERMINAL_CMD (iso/scripts/luks-e2e.sh:46,1093) and the matching test change (tests/test_iso_ci.py:157-158) all match #1223. The light/dark theme the issue asks for is already in the skel config (contracts/bluefin-desktop.toml:255-256, scripts/configure-services.sh:174-182). I could not verify the native package's runtime behavior, because no image was built and the RPM is not published yet.
Confidence: 3/5 (needs attention) — 1 medium finding; 2 perspectives requested changes
— hive: agent=reviewer backend=claude model=claude-opus-5-5 effort=medium claude=2.1.325
|
We use ghostty flatpak?? |
…ork (#1340) The native Ghostty switch tracked in #1223 was overruled by the Flatpak-first decision on #1270, and its implementation PR (#1308) and factory recipe were closed. The parity triage still listed ghostty as planned, so the gap report kept counting it as debt. Move it to the waived Flatpak-first group with baobab, Papers and sushi, and drop native Ghostty from the README and package-contract lists of planned structural moves. Closes #1223 Hive-Run: #1223 Hive-Plan: issue-1223 Hive-Spec: issue-1223#flatpak-first-waiver Assisted-by: Claude Opus 5.5 via Claude Code Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Signed-off-by: Danathar <Danathar@users.noreply.github.com> Co-authored-by: hanthor <5840441+hanthor@users.noreply.github.com>
Stacked on #1307 (Dakota swaps chain). Blocked on factory publish of ghostty (projectbluefin/utah-packages#1154, which needs zig #1152 and gtk4-layer-shell from #1147).
Dakota builds Ghostty natively (bluefin/ghostty.bst) and ships no Ptyxis.
Utah now installs the factory's ghostty RPM (utah-packages#1154, on Zig
0.17 from #1152) and drops:
~/.config/ghostty (native Ghostty reads it directly), and its tests
The LUKS e2e opens the native binary (TERMINAL_CMD, overridable) instead
of
flatpak run. Ctrl+Alt+T stays on xdg-terminal-exec, and the skelconfig keeps Dakota's light/dark theme.
Blocked on the factory publishing ghostty.
Closes #1223
Verified: tests/test_iso_ci.py, test_desktop_contract.py and test_desktop_contract_verify.py pass (213). The full
just checkruns in CI. No image built.