From 4317cd4f587dc3b81adcdcc8a8d1c0818b1fb6f2 Mon Sep 17 00:00:00 2001 From: Ivan Nikolaenko Date: Tue, 1 Aug 2023 11:07:32 +0300 Subject: [PATCH] weston.ini: Keep weston-terminal launcher When adding launchers on weston panel, new launchers override existing weston-terminal launcher which has to be enabled explicitly in this case. Signed-off-by: Ivan Nikolaenko --- modules/graphics/weston.ini.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/graphics/weston.ini.nix b/modules/graphics/weston.ini.nix index 7be80d886..256b0d6fc 100644 --- a/modules/graphics/weston.ini.nix +++ b/modules/graphics/weston.ini.nix @@ -26,14 +26,16 @@ mkLaunchers = lib.concatMapStrings mkLauncher; gala-app = pkgs.callPackage ../../user-apps/gala {}; - demoLaunchers = [ - # Add application launchers - # Adding terminal launcher because it is overwritten if other launchers are on the panel + defaultLauncher = [ + # Keep weston-terminal launcher always enabled explicitly since if someone adds + # a launcher on the panel, the launcher will replace weston-terminal launcher. { path = "${pkgs.weston}/bin/weston-terminal"; icon = "${pkgs.weston}/share/weston/icon_terminal.png"; } - + ]; + demoLaunchers = [ + # Add application launchers { path = "${pkgs.chromium}/bin/chromium --enable-features=UseOzonePlatform --ozone-platform=wayland"; icon = "${pkgs.chromium}/share/icons/hicolor/24x24/apps/chromium.png"; @@ -76,7 +78,7 @@ in { }; config = lib.mkIf cfg.enable { - ghaf.graphics.weston.launchers = lib.optionals cfg.enableDemoApplications demoLaunchers; + ghaf.graphics.weston.launchers = defaultLauncher ++ lib.optionals cfg.enableDemoApplications demoLaunchers; environment.systemPackages = with pkgs; lib.optionals cfg.enableDemoApplications [ # Graphical applications