display management in gui vm

- Turn off the display when system is suspended and turn on when it resumes. Signed-off-by: Ganga Ram <Ganga.Ram@tii.ae>
tiiuae · Oct 24, 2024 · b4b747b · b4b747b
1 parent 5d5ae6d
commit b4b747b
Show file tree

Hide file tree

Showing 8 changed files with 82 additions and 9 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -144,7 +144,7 @@
     };
 
     givc = {
-      url = "github:tiiuae/ghaf-givc/68079deac890d19d84389becc37805310fc0107f";
+      url = "github:tiiuae/ghaf-givc/8bf77b04420c5c70478eba27b877f5e83e6b438d";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-parts.follows = "flake-parts";

diff --git a/modules/givc/flake-module.nix b/modules/givc/flake-module.nix
@@ -12,6 +12,10 @@
       inputs.givc.nixosModules.host
       ./common.nix
       ./host.nix
+      {
+        # Include givc overlay to import app
+        nixpkgs.overlays = [ inputs.givc.overlays.default ];
+      }
     ];
     givc-guivm.imports = [
       inputs.givc.nixosModules.sysvm

diff --git a/modules/givc/guivm.nix b/modules/givc/guivm.nix
@@ -25,6 +25,10 @@ in
         port = "9000";
         tls.enable = config.ghaf.givc.enableTls;
         admin = config.ghaf.givc.adminConfig;
+        services = [
+          "display-suspend.service"
+          "display-resume.service"
+        ];
       };
   };
 }
diff --git a/modules/hardware/common/qemu.nix b/modules/hardware/common/qemu.nix
@@ -29,9 +29,6 @@ in
     ghaf.qemu.guivm = optionalAttrs (hasAttr "hardware" config.ghaf) {
       microvm.qemu.extraArgs =
         [
-          # Button
-          "-device"
-          "button"
           # Battery
           "-device"
           "battery"

diff --git a/modules/host/default.nix b/modules/host/default.nix
@@ -3,7 +3,10 @@
 #
 # Modules that should be only imported to host
 #
-{ lib, ... }:
+{
+  lib,
+  ...
+}:
 {
   networking.hostName = lib.mkDefault "ghaf-host";
 

diff --git a/modules/microvm/virtualization/microvm/guivm.nix b/modules/microvm/virtualization/microvm/guivm.nix
@@ -89,6 +89,35 @@ let
             services.xdghandlers.enable = true;
           };
 
+          # Adding below systemd services to save power by turning off display when system is suspended / lid close
+          systemd.services.display-suspend = {
+            enable = true;
+            description = "Display Suspend Service";
+            serviceConfig = {
+              Type = "oneshot";
+              ExecStart = ''
+                ${pkgs.wlopm}/bin/wlopm --off '*' 
+              '';
+              Environment = ''
+                WAYLAND_DISPLAY=/run/user/1000/wayland-0 
+              '';
+            };
+          };
+
+          systemd.services.display-resume = {
+            enable = true;
+            description = "Display Resume Service";
+            serviceConfig = {
+              Type = "oneshot";
+              ExecStart = ''
+                ${pkgs.wlopm}/bin/wlopm --on '*'  
+              '';
+              Environment = ''
+                WAYLAND_DISPLAY=/run/user/1000/wayland-0 
+              '';
+            };
+          };
+
           systemd.services."waypipe-ssh-keygen" =
             let
               keygenScript = pkgs.writeShellScriptBin "waypipe-ssh-keygen" ''

diff --git a/modules/microvm/virtualization/microvm/microvm-host.nix b/modules/microvm/virtualization/microvm/microvm-host.nix
@@ -9,6 +9,21 @@
 }:
 let
   cfg = config.ghaf.virtualization.microvm-host;
+  manageDisplay =
+    config.ghaf.givc.enable
+    && config.ghaf.virtualization.microvm.adminvm.enable
+    && config.ghaf.virtualization.microvm.guivm.enable;
+
+  inherit (builtins) replaceStrings;
+  cliArgs = replaceStrings [ "\n" ] [ " " ] ''
+    --name ${config.ghaf.givc.adminConfig.name}
+    --addr ${config.ghaf.givc.adminConfig.addr}
+    --port ${config.ghaf.givc.adminConfig.port}
+    ${lib.optionalString config.ghaf.givc.enableTls "--cacert /run/givc/ca-cert.pem"}
+    ${lib.optionalString config.ghaf.givc.enableTls "--cert /run/givc/ghaf-host-cert.pem"}
+    ${lib.optionalString config.ghaf.givc.enableTls "--key /run/givc/ghaf-host-key.pem"}
+    ${lib.optionalString (!config.ghaf.givc.enableTls) "--notls"}
+  '';
 in
 {
   imports = [
@@ -54,6 +69,27 @@ in
         withHardenedConfigs = true;
       };
       ghaf.givc.host.enable = true;
+      systemd.services.display-suspend = lib.mkIf manageDisplay {
+        enable = true;
+        description = "Display Suspend Service";
+        serviceConfig = {
+          Type = "oneshot";
+          ExecStart = "${pkgs.givc-cli}/bin/givc-cli ${cliArgs} suspend";
+        };
+        wantedBy = [ "sleep.target" ];
+        before = [ "sleep.target" ];
+      };
+
+      systemd.services.display-resume = lib.mkIf manageDisplay {
+        enable = true;
+        description = "Display Resume Service";
+        serviceConfig = {
+          Type = "oneshot";
+          ExecStart = "${pkgs.givc-cli}/bin/givc-cli ${cliArgs} wakeup";
+        };
+        wantedBy = [ "suspend.target" ];
+        after = [ "suspend.target" ];
+      };
 
       # TODO: remove hardcoded paths
       systemd.services."microvm@audio-vm".serviceConfig =