-
-
Notifications
You must be signed in to change notification settings - Fork 13.1k
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/{hyprland, wayland-common}: disable wlr portal for hyprland, enable xdg autostart for all wayland compositors #315827
Conversation
This commit: - Adds wlr-portal override of wayland-session module (enabled by default) - Disable it for hyprland module
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM.
@fufexan is there a reason you are not in |
AFAIK it's not required to have a maintainer for a module, so I didn't add myself when I created it. |
Exactly my point. Done |
I plan to backport this to stable as well, but #314978 should be merged for backport to work. |
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/prs-ready-for-review/3032/4014 |
@fufexan perhaps also add From the description:
|
Might make sense. Would it conflict with the HM option? It is being set to true by default in the HM module for Hyprland. |
The mechanism behind the option on Nixpkgs is just a systemd service. I feel like Home Manager, by itself, has a nice mechanism for avoiding conflicts. I believe if any actions are to be needed, they need to be performed on the Home Manager side. Home manager bases its development off Nixpkgs master, not the other way around. |
I added it to the common |
c6c6cc9
to
55742fd
Compare
xwayland, wlr-portal -> enable-xwayland, enable-wlr-portal
55742fd
to
de77718
Compare
@fufexan is this pull request good to go? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Mic92 yes, LGTM.
Thanks! @Mic92 would love to see this merged. |
Is there a particular reason for which this change isn't flagged with a error: The option `xdg.portal.wlr.enable' has conflicting definition values:
- In `/nix/store/aacfsg6r005hi7gna3s1vlpzrg5v5264-source/hosts/shared/pc/hyprland.nix': true
- In `/nix/store/8s55w0927lh3mdbkxf434zb0c5hqsz8z-source/nixos/modules/programs/wayland/hyprland.nix': false
Use `lib.mkForce value` or `lib.mkDefault value` to change the priority on any of these definitions. |
FYI you don't need the wlr portal if you use hyprland. The hyprland portal was forked from the wlroots one. |
That people will notice it and hopefully remove it. |
services.flatpak.enable = true;
|
Please create a new issue with config details @wxlyyy |
Description of changes
Hyprland has its own portal
xdg-desktop-portal-hyprland
and does not need thewlr
portal.As a follow up to #240989,
Additionally, enable xdg autostart service for Wayland Window compositors as unlike DEs, they do not handle it themselves.
Things done
CC: @fufexan @SuperSandro2000
Add a 👍 reaction to pull requests you find important.