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

nixos/display-managers: don't force graphical-session.target activation for UWSM sessions #391801

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

Scrumplex
Copy link
Member

UWSM already handles graphical-session.target.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

…on for UWSM sessions

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Mar 21, 2025
@Scrumplex
Copy link
Member Author

CC @Vladimir-csp

Do you think there is a better way to detect UWSM than checking for one of its env vars?

@github-actions github-actions bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Mar 21, 2025
@Vladimir-csp
Copy link

When is this code being executed? If during session startup, then maybe something like this may be tested on being non-empty: systemctl --user list-units --state=active,activating -ql --plain wayland-wm-env@*.service wayland-wm@*.service

@Scrumplex
Copy link
Member Author

The script this is used in is called as a session wrappper by sddm, ly and some other DMs.

I think we might not be able to easily detect uwsm here, as it is run before exec-ing the actual WM/DE

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants