Fully migrate to labwc, remove weston

This patch fully migrates Ghaf to labwc, removing Weston compositor support, improves usability and performance of the labwc environment. Signed-off-by: Humaid Alqasimi <humaid.alqassimi@tii.ae>
tiiuae · Jun 3, 2024 · d90b9f0 · d90b9f0
1 parent 04af95b
commit d90b9f0
Show file tree

Hide file tree

Showing 49 changed files with 553 additions and 1,433 deletions.
diff --git a/assets/icons/png/app.png b/assets/icons/png/app.png
diff --git a/assets/icons/png/appflowy.png b/assets/icons/png/appflowy.png
diff --git a/assets/icons/png/browser.png b/assets/icons/png/browser.png
diff --git a/assets/icons/png/element.png b/assets/icons/png/element.png
diff --git a/assets/icons/png/pdf.png b/assets/icons/png/pdf.png
diff --git a/assets/icons/png/settings.png b/assets/icons/png/settings.png
diff --git a/assets/icons/png/windows.png b/assets/icons/png/windows.png
diff --git a/assets/icons/svg/app.svg b/assets/icons/svg/app.svg
diff --git a/assets/icons/svg/appflowy.svg b/assets/icons/svg/appflowy.svg
diff --git a/assets/icons/svg/browser.svg b/assets/icons/svg/browser.svg
diff --git a/assets/icons/svg/close.svg b/assets/icons/svg/close.svg
diff --git a/assets/icons/svg/icon_arrow.svg b/assets/icons/svg/icon_arrow.svg
diff --git a/assets/icons/svg/iconify.svg b/assets/icons/svg/iconify.svg
diff --git a/assets/icons/svg/max.svg b/assets/icons/svg/max.svg
diff --git a/assets/icons/svg/pdf.svg b/assets/icons/svg/pdf.svg
diff --git a/assets/icons/svg/settings.svg b/assets/icons/svg/settings.svg
diff --git a/assets/icons/svg/wifi.svg b/assets/icons/svg/wifi.svg
diff --git a/assets/icons/svg/windows.svg b/assets/icons/svg/windows.svg
diff --git a/lib/icons.nix b/lib/icons.nix
@@ -1,6 +1,6 @@
 # Copyright 2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
-{pkgs, ...}: rec {
+{pkgs, ...}: {
   /*
     *
   Resizes a PNG to fit the given size.

diff --git a/lib/launcher.nix b/lib/launcher.nix
@@ -0,0 +1,17 @@
+# Copyright 2024 TII (SSRC) and the Ghaf contributors
+# SPDX-License-Identifier: Apache-2.0
+_: {
+  rmDesktopEntries = pkgs:
+    map (pkg:
+      pkg.overrideAttrs (old: let
+        pInst =
+          if (old ? postInstall)
+          then old.postInstall
+          else "";
+      in {
+        desktopItems = null;
+        desktopItem = null;
+        postInstall = pInst + "rm -rf \"$out/share/applications\"";
+      }))
+    pkgs;
+}
diff --git a/modules/common/development/debug-tools.nix b/modules/common/development/debug-tools.nix
@@ -15,6 +15,7 @@
   nvpmodel-check = pkgs.callPackage ./scripts/nvpmodel_check.nix {};
 
   inherit (lib) mkEnableOption mkIf;
+  inherit (import ../../../lib/launcher.nix {inherit pkgs lib;}) rmDesktopEntries;
 in {
   options.ghaf.development.debug.tools = {
     enable = mkEnableOption "Debug Tools";
@@ -39,7 +40,6 @@ in {
           ethtool
           # Basic monitors
 
-          htop
           iftop
           iotop
           traceroute
@@ -64,12 +64,13 @@ in {
         nvpmodel-check
         rm-linux-bootmgrs
       ]
+      ++ rmDesktopEntries [pkgs.htop]
       # TODO Can this be changed to platformPkgs to filter ?
       # LuaJIT (which is sysbench dependency) not available on RISC-V
       ++ lib.optional (config.nixpkgs.hostPlatform.system != "riscv64-linux") pkgs.sysbench
       # runtimeShell (unixbench dependency) not available on RISC-V nor on cross-compiled Orin AGX/NX
       ++ lib.optional (pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform) pkgs.unixbench
       # Build VLC only on x86
-      ++ lib.optional (config.nixpkgs.hostPlatform.system == "x86_64-linux") pkgs.vlc;
+      ++ lib.optionals (config.nixpkgs.hostPlatform.system == "x86_64-linux") rmDesktopEntries [pkgs.vlc];
   };
 }
diff --git a/modules/desktop/graphics/default.nix b/modules/desktop/graphics/default.nix
@@ -2,9 +2,8 @@
 # SPDX-License-Identifier: Apache-2.0
 {
   imports = [
-    ./weston.nix
     ./labwc.nix
-    ./weston.ini.nix
+    ./labwc.config.nix
     ./waybar.config.nix
     ./demo-apps.nix
     ./fonts.nix