givc bump (tiiuae#1019)

* feat(givc): givc bump Added features: - dedicated start commands for applications, vms, and services in cli - cli reports id to address the respective entity - runtime units are correctly merged Signed-off-by: Manuel Bluhm <[email protected]> * Separate VM definitions from services for host givc Signed-off-by: Santtu Lakkala <[email protected]> * fix(format): file format Signed-off-by: Manuel Bluhm <[email protected]> --------- Signed-off-by: Manuel Bluhm <[email protected]> Signed-off-by: Santtu Lakkala <[email protected]> Co-authored-by: Santtu Lakkala <[email protected]>
brianmcgillion · Feb 26, 2025 · c3725ca · c3725ca
1 parent 63d3810
commit c3725ca
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -141,7 +141,7 @@
     };
 
     givc = {
-      url = "github:tiiuae/ghaf-givc/1e11144bfadaa46ceb7e403c714bcc75dea045b5";
+      url = "github:tiiuae/ghaf-givc/62a62c682435a216e324e262f28c7184ab45663e";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-parts.follows = "flake-parts";

diff --git a/modules/givc/host.nix b/modules/givc/host.nix
@@ -8,7 +8,7 @@
 }:
 let
   cfg = config.ghaf.givc.host;
-  inherit (builtins) map attrNames;
+  inherit (builtins) map;
   inherit (lib)
     mkEnableOption
     mkIf
@@ -36,7 +36,9 @@ in
         "reboot.target"
         "poweroff.target"
         "suspend.target"
-      ] ++ map (vmName: "microvm@${vmName}.service") (attrNames config.microvm.vms);
+      ];
+      systemVms = map (vmName: "microvm@${vmName}.service") config.ghaf.common.systemHosts;
+      appVms = map (vmName: "microvm@${vmName}.service") config.ghaf.common.appHosts;
       tls.enable = config.ghaf.givc.enableTls;
       admin = head config.ghaf.givc.adminConfig.addresses;
     };

diff --git a/modules/microvm/virtualization/microvm/common/xdgitems.nix b/modules/microvm/virtualization/microvm/common/xdgitems.nix
@@ -57,7 +57,7 @@ let
       echo "Opening $filepath with type $type"
       cp -f "$filepath" "/run/xdg/$type/$filename"
       dst="/run/xdg/$type/${config.ghaf.storagevm.name}/$filename"
-      ${pkgs.givc-cli}/bin/givc-cli ${config.ghaf.givc.cliArgs} start --vm zathura-vm "xdg-$type" -- "$dst"
+      ${pkgs.givc-cli}/bin/givc-cli ${config.ghaf.givc.cliArgs} start app --vm zathura-vm "xdg-$type" -- "$dst"
     '';
   };
 in

diff --git a/modules/microvm/virtualization/microvm/guivm.nix b/modules/microvm/virtualization/microvm/guivm.nix
@@ -41,7 +41,7 @@ let
             inherit (app) description;
             #inherit (app) givcName;
             vm = app.vmName;
-            path = "${pkgs.givc-cli}/bin/givc-cli ${config.ghaf.givc.cliArgs} start --vm ${vm} ${app.givcName}";
+            path = "${pkgs.givc-cli}/bin/givc-cli ${config.ghaf.givc.cliArgs} start app --vm ${vm} ${app.givcName}";
             inherit (app) icon;
           }) virtualApps;
           # Launchers for all desktop, non-virtualized applications that run in the GUIVM

diff --git a/packages/open-normal-extension/open_normal.sh b/packages/open-normal-extension/open_normal.sh
@@ -57,7 +57,7 @@ if [ -r "$CFGF" ]; then
     else
         # Do not complain about double quotes, $GIVC_OPTS is purposefully unquoted here
         # shellcheck disable=SC2086
-        "${GIVC_PATH}/bin/givc-cli" $GIVC_OPTS start --vm chrome-vm google-chrome -- "${URL}" > /dev/null 2>&1
+        "${GIVC_PATH}/bin/givc-cli" $GIVC_OPTS start app --vm chrome-vm google-chrome -- "${URL}" > /dev/null 2>&1
         RES=$?
         # Just return the exit value of givc-cli back to the browser
         Msg "{\"status\":\"${RES}\"}"