Repository navigation
stoa-env: XDG_CURRENT_DESKTOP fallback follows the chosen compositor - #202
Merged
Merged
Conversation
The fallback was hard-coded to "Hyprland". It only applies to shells started outside a session, but that includes the tty1 login that autostart hands to niri-session, so a niri machine advertised Hyprland there (and in anything launched from a TTY), which can steer xdg-desktop-portal to the wrong backend. It now reads ~/.config/stoa/wm, else picks the installed compositor (Hyprland first), the same pick as stoa-autostart-hyprland.sh. A value set by the session is still never touched. Covered by W8 in tests/test_stoa_wm.sh. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LviacJW5Bp5ywJzNWy8AWM
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
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.
Summary
shell/stoa-env.shexportedXDG_CURRENT_DESKTOP="${XDG_CURRENT_DESKTOP:-Hyprland}". The fallback only fires outside a session, but that includes the tty1 login shell that autostart hands toniri-session, so niri machines advertised Hyprland there. That can steer xdg-desktop-portal (screen sharing, file pickers) to the wrong backend.~/.config/stoa/wm(written by post-install.sh /stoa-wm set). Without that file it picks the installed compositor, Hyprland first. This is the same pickstoa-autostart-hyprland.shmakes. A value the session already set is never touched.tests/test_stoa_wm.sh: a session value is kept, the file is honoured, the file beats installed binaries, and the binary fallback works. Three of them fail against the old line.Test plan
tests/run.sh --strict: 18 passedecho $XDG_CURRENT_DESKTOPand expectniriGenerated by Claude Code