Create testing profile for non-default features

This patch enables features that are needed for testing and validation, which are not currently enabled by defualt in the standard MVP image. The corresponding image is intended only for the bi-weekly regression tests at present. Signed-off-by: Brian McGillion <[email protected]>
tiiuae · Sep 4, 2024 · 7bb0c8e · 7bb0c8e
1 parent 15f2fd6
commit 7bb0c8e
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 10 deletions.
diff --git a/modules/microvm/virtualization/microvm/guivm.nix b/modules/microvm/virtualization/microvm/guivm.nix
@@ -39,8 +39,13 @@ let
               applications.enable = false;
               graphics.enable = true;
             };
+
             # To enable screen locking set to true
-            graphics.labwc.autolock.enable = false;
+            graphics.labwc = {
+              autolock.enable = lib.mkDefault config.ghaf.graphics.labwc.autolock.enable;
+              autologinUser = lib.mkDefault config.ghaf.graphics.labwc.autologinUser;
+            };
+
             development = {
               ssh.daemon.enable = lib.mkDefault config.ghaf.development.ssh.daemon.enable;
               debug.tools.enable = lib.mkDefault config.ghaf.development.debug.tools.enable;

diff --git a/modules/reference/profiles/default.nix b/modules/reference/profiles/default.nix
@@ -7,5 +7,6 @@
   imports = [
     ./laptop-x86.nix
     ./mvp-user-trial.nix
+    ./mvp-user-trial-extras.nix
   ];
 }
diff --git a/modules/reference/profiles/mvp-user-trial-extras.nix b/modules/reference/profiles/mvp-user-trial-extras.nix
@@ -0,0 +1,53 @@
+# Copyright 2022-2024 TII (SSRC) and the Ghaf contributors
+# SPDX-License-Identifier: Apache-2.0
+{ config, lib, ... }:
+let
+  cfg = config.ghaf.reference.profiles.mvp-user-trial-extras;
+in
+{
+  imports = [ ./mvp-user-trial.nix ];
+
+  options.ghaf.reference.profiles.mvp-user-trial-extras = {
+    enable = lib.mkEnableOption "Enable the mvp configuration for apps and services";
+  };
+
+  config = lib.mkIf cfg.enable {
+    ghaf = {
+      reference = {
+        profiles = {
+          mvp-user-trial.enable = true;
+        };
+
+        programs = {
+          windows-launcher = {
+            enable = true;
+            spice = true;
+          };
+        };
+      };
+
+      profiles = {
+        # Enable below option for host hardening features
+        # Secure Boot
+        host-hardening.enable = true;
+      };
+
+      virtualization.microvm = {
+        # Enable idsvm and the MiTM features
+        idsvm = {
+          enable = lib.mkForce true;
+          mitmproxy.enable = lib.mkForce true;
+        };
+      };
+
+      # Enable below option for session lock feature
+      graphics = {
+        boot.enable = lib.mkForce true;
+        labwc = {
+          autolock.enable = lib.mkForce true;
+          autologinUser = lib.mkForce null;
+        };
+      };
+    };
+  };
+}
diff --git a/modules/reference/profiles/mvp-user-trial.nix b/modules/reference/profiles/mvp-user-trial.nix
@@ -18,6 +18,8 @@ in
 
   config = lib.mkIf cfg.enable {
     ghaf = {
+      graphics.labwc.autolock.enable = false;
+
       reference = {
         appvms = {
           enable = true;
@@ -34,13 +36,6 @@ in
           dendrite = true;
         };
 
-        programs = {
-          windows-launcher = {
-            enable = false;
-            spice = false;
-          };
-        };
-
         personalize = {
           keys.enable = true;
         };

diff --git a/targets/laptop/flake-module.nix b/targets/laptop/flake-module.nix
@@ -33,6 +33,15 @@ let
         };
       }
     ])
+    (laptop-configuration "lenovo-x1-extras" "debug" [
+      self.nixosModules.disko-ab-partitions-v1
+      {
+        ghaf = {
+          hardware.definition.configFile = "/lenovo-x1/definitions/x1-gen11.nix";
+          reference.profiles.mvp-user-trial-extras.enable = true;
+        };
+      }
+    ])
     (laptop-configuration "dell-latitude-7230" "debug" [
       self.nixosModules.disko-basic-partition-v1
       {
@@ -71,6 +80,15 @@ let
         };
       }
     ])
+    (laptop-configuration "lenovo-x1-extras" "release" [
+      self.nixosModules.disko-ab-partitions-v1
+      {
+        ghaf = {
+          hardware.definition.configFile = "/lenovo-x1/definitions/x1-gen11.nix";
+          reference.profiles.mvp-user-trial-extras.enable = true;
+        };
+      }
+    ])
     (laptop-configuration "dell-latitude-7230" "release" [
       self.nixosModules.disko-basic-partition-v1
       {

diff --git a/targets/laptop/laptop-configuration-builder.nix b/targets/laptop/laptop-configuration-builder.nix
@@ -33,8 +33,6 @@ let
                 # variant type, turn on debug or release
                 debug.enable = variant == "debug";
                 release.enable = variant == "release";
-                # Enable below option for host hardening features
-                host-hardening.enable = false;
               };
             };
           })