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/hyprland: enable xdg.portal by default + use lib.mkDefault for enableWlrPortal #318759

Merged
merged 2 commits into from
Jun 14, 2024
Merged

Conversation

leon-erd
Copy link
Contributor

@leon-erd leon-erd commented Jun 10, 2024

Description of changes

The hyprland module specifies

xdg.portal = {
  extraPortals = [ cfg.portalPackage ];
  configPackages = lib.mkDefault [ cfg.package ];
};

but doesn't set xdg.portal.enable = true;. I think it was previously set to true because of xdg.portal.wlr.enable = true;.
However, since this MR #315827 sets xdg.portal.wlr.enable = false; by default xdg-dektop-portal will be disabled when using the hyprland module out of the box.

Fixes #319630

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/)
  • 24.11 Release Notes (or backporting 23.11 and 24.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.

@JohnRTitor @fufexan

Add a 👍 reaction to pull requests you find important.

Copy link
Contributor

@JohnRTitor JohnRTitor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please squash the commits and force-push.

You might want to rebase the branch to latest master as well, since eval was failing earlier.

@leon-erd
Copy link
Contributor Author

Done! Eval also seems to work now :)

Copy link
Contributor

@JohnRTitor JohnRTitor left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@leon-erd
Copy link
Contributor Author

Is there anything more that I need to do to get this merged? :)
@SuperSandro2000 do you have merging rights or should I ping someone else?

@fufexan fufexan added the backport release-24.05 Backport PR automatically label Jun 12, 2024
Copy link
Member

@donovanglover donovanglover left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could make the commit easier to grep for by using nixos/hyprland: instead of hyprland module:. See the file history.

@leon-erd
Copy link
Contributor Author

Sure! Do I have to ping anyone specific?

@leon-erd leon-erd changed the title hyprland module: enable xdg.portal by default nixos/hyprland: enable xdg.portal by default Jun 13, 2024
@fufexan
Copy link
Contributor

fufexan commented Jun 13, 2024

@leon-erd can you also update the commit message? Easiest method is git commit --amend and editing the message.

@fufexan
Copy link
Contributor

fufexan commented Jun 13, 2024

Can you also set enableWlrPortal to lib.mkDefault false;? That would fix #319630.

@leon-erd
Copy link
Contributor Author

Do you want me to squash the commits?

@fufexan
Copy link
Contributor

fufexan commented Jun 13, 2024

Nope, they're fine separate. Also please add "fixes #319630" in the PR description.

@leon-erd leon-erd changed the title nixos/hyprland: enable xdg.portal by default nixos/hyprland: enable xdg.portal by default + use lib.mkDefault for enableWlrPortal Jun 13, 2024
@Atemu Atemu merged commit 421fb34 into NixOS:master Jun 14, 2024
26 checks passed
Copy link
Contributor

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-318759-to-release-24.05 origin/release-24.05
cd .worktree/backport-318759-to-release-24.05
git switch --create backport-318759-to-release-24.05
git cherry-pick -x 9585e5d3aa0ad34b9e6a3bc2b3a1b4ca13befc85 5b216845b6976077cf6b117107c9366bef561345

@Atemu
Copy link
Member

Atemu commented Jun 14, 2024

Ran into this issue, worked around it in my config and then ran into this PR while looking for something else.

Thanks!

@JohnRTitor
Copy link
Contributor

JohnRTitor commented Jun 14, 2024

@fufexan @Atemu #315827 needs to be backported with this as well. There was consensus to run this on unstable for a while and then backport it, I assume it (xdg autostart) did not cause any issues and should be fine to backport it now?

@fufexan
Copy link
Contributor

fufexan commented Jun 14, 2024

@JohnRTitor I haven't seen any changes in functionality, but I also don't use xdg autostart.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Sway and Hyprland modules incompatible
6 participants