Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport #6253 and #6332 #6423

Open
wants to merge 14 commits into
base: release-24.11
Choose a base branch
from

Conversation

lordkekz
Copy link
Contributor

@lordkekz lordkekz commented Feb 9, 2025

Description

Backport of #6253 (standardize wayland graphical services) and #6332 (create tray.target if xsession is not enabled).

IMO this should be backported because it fixes a common activation failure, which impacted other activation steps like stylix.

The first PR was already backwards compatible, I merely removed a change for a module that isn't in stable.
The second PR wasn't initially backwards compatible, but I added lib.mkDefault to ensure that configurations with the workaround discussed in #2064 still work.

Feel free to reject it if you don't want this backported.

Checklist

  • Change is backwards compatible.

  • Code formatted with ./format.

  • Code tested through nix-shell --pure tests -A run.all
    or nix build --reference-lock-file flake.lock ./tests#test-all using Flakes.

  • Test cases updated/added. See example.

  • Commit messages are formatted like

    {component}: {description}
    
    {long description}
    

    See CONTRIBUTING for more information and recent commit messages for examples.

  • If this PR adds a new module

    • Added myself as module maintainer. See example.

Maintainer CC

thiagokokada and others added 13 commits February 9, 2025 19:51
Also add `ConditionEnvironment`.
Also add `ConditionEnvironment`.
Also add `ConditionEnvironment`.
Also add missing `ConditionEnvironment`.
…#6332)

Create a internal/read-only trayTarget option for the xsession, which is
also used in wayland's config, if the former is not enabled.

Remove all other definitions of `systemd.user.targets.tray`, i. e, the
ones from the following modules: hyprland, sway, river and wayfire.
@lordkekz lordkekz marked this pull request as ready for review February 9, 2025 21:47
@lordkekz lordkekz changed the title Backport #6253: standardize wayland graphical services Backport #6253 and #6332 Feb 9, 2025
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.

3 participants