Merge pull request #318759 from leon-erd/master

nixos/hyprland: enable xdg.portal by default + use lib.mkDefault for enableWlrPortal
This commit is contained in:
Atemu
2024-06-14 12:41:53 +02:00
committed by GitHub

View File

@@ -56,6 +56,7 @@ in
services.displayManager.sessionPackages = [ cfg.package ]; services.displayManager.sessionPackages = [ cfg.package ];
xdg.portal = { xdg.portal = {
enable = true;
extraPortals = [ cfg.portalPackage ]; extraPortals = [ cfg.portalPackage ];
configPackages = lib.mkDefault [ cfg.package ]; configPackages = lib.mkDefault [ cfg.package ];
}; };
@@ -70,7 +71,7 @@ in
(import ./wayland-session.nix { (import ./wayland-session.nix {
inherit lib pkgs; inherit lib pkgs;
enableXWayland = cfg.xwayland.enable; enableXWayland = cfg.xwayland.enable;
enableWlrPortal = false; # Hyprland has its own portal, wlr is not needed enableWlrPortal = lib.mkDefault false; # Hyprland has its own portal, wlr is not needed
}) })
]); ]);