Add zoom app in comms-vm

zoom-us application is added into comms-vm with icon A launch script is created to add environment to waypipe Signed-off-by: Berk Arslan <[email protected]>
tiiuae · Oct 3, 2024 · 5e9ebc9 · 5e9ebc9
1 parent 34ade48
commit 5e9ebc9
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 2 deletions.
diff --git a/modules/common/services/desktop.nix b/modules/common/services/desktop.nix
@@ -132,6 +132,14 @@ in
               icon = "${pkgs.icon-pack}/slack.svg";
             }
 
+            {
+              name = "Zoom";
+              description = "Zoom Videoconferencing Application";
+              vm = "Comms";
+              path = "${pkgs.givc-cli}/bin/givc-cli ${cliArgs} start --vm comms-vm zoom";
+              icon = "${pkgs.icon-pack}/Zoom.svg";
+            }
+
             {
               name = "AppFlowy";
               description = "Productivity & Note-Taking Application";

diff --git a/modules/microvm/virtualization/microvm/appvm.nix b/modules/microvm/virtualization/microvm/appvm.nix
@@ -49,7 +49,7 @@ let
               waypipeBorder = if vm.borderColor != null then "--border \"${vm.borderColor}\"" else "";
               runWaypipe = pkgs.writeScriptBin "run-waypipe" ''
                 #!${pkgs.runtimeShell} -e
-                ${pkgs.waypipe}/bin/waypipe --vsock -s ${toString configHost.ghaf.virtualization.microvm.guivm.waypipePort} ${waypipeBorder} server "$@"
+                ${pkgs.waypipe}/bin/waypipe --vsock -s ${toString configHost.ghaf.virtualization.microvm.guivm.waypipePort} ${waypipeBorder} server ${config.ghaf.givc.appPrefix}/env XDG_CURRENT_DESKTOP=wlroots XDG_SESSION_TYPE=wayland "$@"
               '';
             in
             {

diff --git a/modules/microvm/virtualization/microvm/guivm.nix b/modules/microvm/virtualization/microvm/guivm.nix
@@ -122,6 +122,7 @@ let
                 pkgs.nm-launcher
                 pkgs.bt-launcher
                 pkgs.pamixer
+                pkgs.zoom-us
               ]
               ++ (lib.optional (
                 config.ghaf.profiles.debug.enable && config.ghaf.virtualization.microvm.idsvm.mitmproxy.enable

diff --git a/modules/reference/appvms/comms.nix b/modules/reference/appvms/comms.nix
@@ -26,6 +26,8 @@ in
     pkgs.element-gps
     pkgs.gpsd
     pkgs.tcpdump
+    pkgs.xdg-utils
+    pkgs.zoom-us
   ] ++ pkgs.lib.optionals isDendritePineconeEnabled [ dendrite-pinecone ];
   macAddress = "02:00:00:03:09:01";
   ramMb = 4096;
@@ -87,9 +89,11 @@ in
         applications = lib.mkForce ''
           {
           "element": "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/element-desktop --enable-features=UseOzonePlatform --ozone-platform=wayland",
-          "slack":   "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/chromium --enable-features=UseOzonePlatform --ozone-platform=wayland --app=https://app.slack.com/client ${config.ghaf.givc.idsExtraArgs}"
+          "slack":   "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/chromium --enable-features=UseOzonePlatform --ozone-platform=wayland --app=https://app.slack.com/client ${config.ghaf.givc.idsExtraArgs}",
+          "zoom":    "${config.ghaf.givc.appPrefix}/run-waypipe ${config.ghaf.givc.appPrefix}/zoom"
           }'';
       };
+      config.chromium.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland";
     }
   ];
   borderColor = "#337aff";

diff --git a/overlays/custom-packages/default.nix b/overlays/custom-packages/default.nix
@@ -21,4 +21,5 @@
   gtklock = import ./gtklock { inherit prev; };
   hardware-scan = final.callPackage ../../packages/hardware-scan { };
   pulseaudio-ghaf = import ./pulseaudio { inherit prev; };
+  zoom-us = import ./zoom-us { inherit prev; };
 })
diff --git a/overlays/custom-packages/zoom-us/default.nix b/overlays/custom-packages/zoom-us/default.nix
@@ -0,0 +1,12 @@
+# Copyright 2022-2024 TII (SSRC) and the Ghaf contributors
+# SPDX-License-Identifier: Apache-2.0
+{ prev, ... }:
+# Disable zoom launcher
+prev.zoom-us.overrideAttrs (_prevAttrs: {
+
+  postFixup = _prevAttrs.postFixup + ''
+          substituteInPlace $out/bin/zoom \
+          --prefix LD_LIBRARY_PATH ":" "$out/opt/zoom/Qt/lib/"
+          --replace opt/zoom/ZoomLauncher opt/zoom/zoom
+        '';
+})
diff --git a/packages/icon-pack/default.nix b/packages/icon-pack/default.nix
@@ -33,6 +33,7 @@ let
     "utilities-terminal.svg"
     "yast-vpn.svg"
     "system-file-manager.svg"
+    "Zoom.svg"
   ];
 in
 runCommand "icon-pack"