Remove weston, use hi-res icons for launchers and other fixes

Improves performance of labwc in Nvidia, fix duplicate icons in
launcher, and other fixes.

Signed-off-by: Humaid Alqasimi <humaid.alqassimi@tii.ae>

modules/desktop/graphics/default.nix

@@ -2,9 +2,7 @@
 # SPDX-License-Identifier: Apache-2.0
 {
   imports = [
-    ./weston.nix
     ./labwc.nix
-    ./weston.ini.nix
     ./waybar.config.nix
     ./demo-apps.nix
     ./fonts.nix

modules/desktop/graphics/demo-apps.nix

@@ -7,15 +7,9 @@
   ...
 }: let
   cfg = config.ghaf.graphics.demo-apps;
-  inherit (import ../../../lib/icons.nix {inherit pkgs lib;}) resizePNG;
 
   /*
-  Scaled down firefox icon
-  */
-  firefox-icon = resizePNG "firefox" "${pkgs.firefox}/share/icons/hicolor/128x128/apps/firefox.png" "24x24";
-
-  /*
-  Generate launchers to be used in weston.ini
+  Generate launchers to be used in the application drawer
 
   Type: mkProgramOption ::  string -> bool -> option
 
@@ -28,7 +22,7 @@
         description = "Include package ${name} to menu and system environment";
       };
 in {
-  options.ghaf.graphics.demo-apps = with lib; {
+  options.ghaf.graphics.demo-apps = {
     chromium = mkProgramOption "Chromium browser" false;
     firefox = mkProgramOption "Firefox browser" config.ghaf.graphics.enableDemoApplications;
     gala-app = mkProgramOption "Gala App" false;
@@ -40,34 +34,34 @@ in {
   config = lib.mkIf config.ghaf.profiles.graphics.enable {
     ghaf.graphics.launchers =
       lib.optional cfg.chromium {
-        name = "chromium";
+        name = "Chromium";
         path = "${pkgs.chromium}/bin/chromium --enable-features=UseOzonePlatform --ozone-platform=wayland";
-        icon = "${pkgs.chromium}/share/icons/hicolor/24x24/apps/chromium.png";
+        icon = "${pkgs.papirus-icon-theme}/share/icons/Papirus/64x64/apps/chromium.svg";
       }
       ++ lib.optional cfg.firefox {
-        name = "firefox";
+        name = "Firefox";
         path = "${pkgs.firefox}/bin/firefox";
-        icon = "${firefox-icon}";
+        icon = "${pkgs.papirus-icon-theme}/share/icons/Papirus/64x64/apps/firefox.svg";
       }
       ++ lib.optional cfg.element-desktop {
-        name = "element";
+        name = "Element";
         path = "${pkgs.element-desktop}/bin/element-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland";
-        icon = "${pkgs.element-desktop}/share/icons/hicolor/24x24/apps/element.png";
+        icon = "${pkgs.papirus-icon-theme}/share/icons/Papirus/64x64/apps/element-desktop.svg";
       }
       ++ lib.optional cfg.gala-app {
-        name = "gala";
+        name = "GALA";
         path = "${pkgs.gala-app}/bin/gala --enable-features=UseOzonePlatform --ozone-platform=wayland";
-        icon = "${pkgs.gala-app}/gala/resources/icon-24x24.png";
+        icon = "${pkgs.papirus-icon-theme}/share/icons/Papirus/64x64/apps/distributor-logo-android.svg";
       }
       ++ lib.optional cfg.zathura {
-        name = "zathura";
+        name = "PDF Viewer";
         path = "${pkgs.zathura}/bin/zathura";
-        icon = "${pkgs.zathura}/share/icons/hicolor/32x32/apps/org.pwmt.zathura.png";
+        icon = "${pkgs.papirus-icon-theme}/share/icons/Papirus/64x64/apps/document-viewer.svg";
       }
       ++ lib.optional (cfg.appflowy && pkgs.stdenv.isx86_64) {
-        name = "appflowy";
+        name = "AppFlowy";
         path = "${pkgs.appflowy}/bin/appflowy";
-        icon = ../../../assets/icons/svg/appflowy.svg;
+        icon = "${pkgs.appflowy}/opt/data/flutter_assets/assets/images/flowy_logo.svg";
       };
     environment.systemPackages =
       lib.optional cfg.chromium pkgs.chromium

modules/desktop/graphics/fonts.nix

@@ -6,9 +6,9 @@
   config,
   ...
 }: let
-  inherit (config.ghaf.graphics) weston labwc;
+  inherit (config.ghaf.graphics) labwc;
 in {
-  config = lib.mkIf (weston.enable || labwc.enable) {
+  config = lib.mkIf labwc.enable {
     fonts.packages = with pkgs; [
       inter
       fira-code-nerdfont

modules/desktop/graphics/ghaf-launcher.nix

@@ -5,6 +5,8 @@
   writeTextDir,
   coreutils,
   nwg-drawer,
+  callPackage,
+  config,
   ...
 }: let
   drawerCSS = writeTextDir "nwg-drawer/drawer.css" ''
@@ -53,12 +55,14 @@
         border-radius: 15px
     }
   '';
+  launchers = callPackage ./launchers.nix {inherit config;};
 in
   writeShellScriptBin
   "ghaf-launcher"
   ''
     export XDG_CONFIG_HOME=${drawerCSS}
     export XDG_CACHE_HOME=$HOME/.cache
+    export XDG_DATA_DIRS=${launchers}/share
     ${coreutils}/bin/mkdir -p $XDG_CACHE_HOME
     ${nwg-drawer}/bin/nwg-drawer -mb 20 -ml 440 -mr 440 -mt 420 -nofs -nocats
   ''

modules/desktop/graphics/labwc.nix

@@ -170,11 +170,19 @@
       </menu>
     </openbox_menu>
   '';
-  launchers = pkgs.callPackage ./launchers.nix {inherit config;};
+  renderers = [ "vulkan" "pixman" "egl2" ];
 in {
   options.ghaf.graphics.labwc = {
     enable = lib.mkEnableOption "labwc";
     lock.enable = lib.mkEnableOption "labwc screen locking";
+    renderer = lib.mkOption {
+      type = lib.types.enum renderers;
+      default = "pixman";
+      description = ''
+            Which wlroots renderer to use.
+            Choose one of: ${lib.concatStringsSep "," renderers}
+      '';
+    };
     wallpaper = lib.mkOption {
       type = lib.types.path;
       default = ../../../assets/wallpaper.png;
@@ -229,7 +237,7 @@ in {
     ghaf.graphics.window-manager-common.enable = true;
 
     environment.systemPackages = with pkgs;
-      [labwc launchers]
+      [labwc]
       # Below sway packages needed for screen locking
       ++ lib.optionals config.ghaf.graphics.labwc.lock.enable [swaylock-effects swayidle]
       # Grim screenshot tool is used for labwc debug-builds
@@ -276,7 +284,7 @@ in {
         Environment = "PATH=${pkgs.openssh}/bin:$PATH";
       };
       environment = {
-        WLR_RENDERER = "pixman";
+        WLR_RENDERER = cfg.renderer;
         # See: https://github.com/labwc/labwc/blob/0.6.5/docs/environment
         XKB_DEFAULT_LAYOUT = "us,fi";
         XKB_DEFAULT_OPTIONS = "XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle";

modules/desktop/graphics/waybar.config.nix

@@ -27,7 +27,7 @@ in {
       {
         name = "Terminal";
         path = "${pkgs.foot}/bin/foot";
-        icon = "${pkgs.foot}/share/icons/hicolor/48x48/apps/foot.png";
+        icon = "${pkgs.papirus-icon-theme}/share/icons/Papirus/64x64/apps/utilities-terminal.svg";
       }
     ];
     environment.etc."waybar/config" = {