nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 15:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixos/wayland-session: cleanup

Browse Source 
xwayland, wlr-portal ->
 enable-xwayland, enable-wlr-portal

(cherry picked from commit de77718887)
This commit is contained in:
John Titor 2024-06-03 09:27:17 +05:30
parent ad1684cd48
commit 898641392c
No known key found for this signature in database
GPG Key ID: 29B0514F4E3C1CC0
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/modules/programs/wayland/hyprland.nix
View File

@ -69,8 +69,8 @@ in
(import ./wayland-session.nix {
inherit lib pkgs;
xwayland = cfg.xwayland.enable;
wlr-portal = false; # Hyprland has its own portal, wlr is not needed
enableXWayland = cfg.xwayland.enable;
enableWlrPortal = false; # Hyprland has its own portal, wlr is not needed
})
]);

2
nixos/modules/programs/wayland/river.nix
View File

@ -57,7 +57,7 @@ in
(import ./wayland-session.nix {
inherit lib pkgs;
xwayland = cfg.xwayland.enable;
enableXWayland = cfg.xwayland.enable;
})
]);

2
nixos/modules/programs/wayland/sway.nix
View File

@ -140,7 +140,7 @@ in
(import ./wayland-session.nix {
inherit lib pkgs;
xwayland = cfg.xwayland.enable;
enableXWayland = cfg.xwayland.enable;
})
]);

8
nixos/modules/programs/wayland/wayland-session.nix
View File

@ -1,8 +1,8 @@
{
lib,
pkgs,
xwayland ? true,
wlr-portal ? true,
enableXWayland ? true,
enableWlrPortal ? true,
}:
{
@ -16,10 +16,10 @@
programs = {
dconf.enable = lib.mkDefault true;
xwayland.enable = lib.mkDefault xwayland;
xwayland.enable = lib.mkDefault enableXWayland;
};
xdg.portal.wlr.enable = wlr-portal;
xdg.portal.wlr.enable = enableWlrPortal;
# Window manager only sessions (unlike DEs) don't handle XDG
# autostart files, so force them to run the service