dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

nixos/wayfire: fix import file with settings required to start service

Browse Source 
Wayfire does not start without further configuration, when
programs.wayfire.enable is the only wayland wm enabled. When sway or a
similar program is also enabled that program imports wayland-session.nix
hiding the problem.

This imports wayland-session.nix and adds the option xwayland.enable to
pass to the file
This commit is contained in:
git@71rd.net 2024-06-24 23:58:09 +00:00
parent b73c2221a4
commit 3f55cc361c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nixos/modules/programs/wayland/wayfire.nix
View File

@ -25,6 +25,7 @@ in
Additional plugins to use with the wayfire window manager.
'';
};
xwayland.enable = lib.mkEnableOption "XWayland" // { default = true; };
};
config = let
@ -33,7 +34,7 @@ in
plugins = cfg.plugins;
};
in
lib.mkIf cfg.enable {
lib.mkIf cfg.enable (lib.mkMerge [{
environment.systemPackages = [
finalPackage
];
@ -46,5 +47,10 @@ in
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050914
config.wayfire.default = lib.mkDefault [ "wlr" "gtk" ];
};
};
}
(import ./wayland-session.nix {
inherit lib pkgs;
enableXWayland = cfg.xwayland.enable;
})
]);
}