Require two target inputs as nixosModules:

- a hardware profile
- a platform profile

The latter is implemented in our reference profile, but can be
constructed downstream in the same way using the ghaf profiles.

Both modules must not have an enable option, these modules are
enabled by default if imported. All other modules should generally
be guarded and enabled where needed.

This only affects the import spaces, all nixosModules and respective
options are available. This import logic should enable easy down-
stream project creation: create a nixosConfiguration, and import
hardware and platform definition modules either from within the
project or inherit from ghaf.

Signed-off-by: Manuel Bluhm <manuel@ssrc.tii.ae>

Author: mbssrc

modules/flake-module.nix

@@ -10,6 +10,7 @@
     ./hardware/flake-module.nix
     ./microvm/flake-module.nix
     ./reference/hardware/flake-module.nix
+    ./reference/profiles/flake-module.nix
     ./profiles/flake-module.nix
     ./common/flake-module.nix
     ./development/flake-module.nix
@@ -21,7 +22,6 @@
     reference-appvms.imports = [ ./reference/appvms ];
     reference-host-demo-apps.imports = [ ./reference/host-demo-apps ];
     reference-personalize.imports = [ ./reference/personalize ];
-    reference-profiles.imports = [ ./reference/profiles ];
     reference-programs.imports = [ ./reference/programs ];
     reference-services.imports = [ ./reference/services ];
   };

modules/hardware/flake-module.nix

@@ -3,7 +3,7 @@
 {
 
   flake.nixosModules = {
-    hw-laptop.imports = [
+    x86_64-hw-laptop.imports = [
       ./definition.nix
       ./x86_64-generic
       ./common/usb/internal.nix
@@ -15,7 +15,7 @@
       ./common/qemu.nix
       ./common/shared-mem.nix
     ];
-    hw-x86_64-generic.imports = [
+    x86_64-hw-generic.imports = [
       ./definition.nix
       ./x86_64-generic
     ];

modules/microvm/flake-module.nix

@@ -18,8 +18,9 @@
     ];
 
     mem-manager.imports = [
-      ./mem-manager.nix
+      ./host/mem-manager.nix
     ];
+
     vm-modules.imports = [
       ./common/ghaf-audio.nix
       ./common/shared-directory.nix

modules/microvm/mem-manager.nix modules/microvm/host/mem-manager.nixmodules/microvm/mem-manager.nix renamed to modules/microvm/host/mem-manager.nix

@@ -23,6 +23,7 @@ in
 {
   imports = [
     inputs.impermanence.nixosModules.impermanence
+    inputs.self.nixosModules.mem-manager
     inputs.self.nixosModules.givc
     ./networking.nix
   ];

modules/microvm/host/microvm-host.nix

@@ -8,8 +8,8 @@
     # Only entries that can be included in those targets without causing conflicts should be included here
     profiles.imports = [
       inputs.self.nixosModules.common
-      inputs.self.nixosModules.graphics
       inputs.self.nixosModules.development
+      inputs.self.nixosModules.graphics
       ./graphics.nix
       ./debug.nix
       ./release.nix
@@ -18,8 +18,10 @@
     # speciic profiles that are needed for certain classes of devices should be included below.
     # This can be on a category basis or integrated into an existing category if it has a common base
     profiles-laptop.imports = [
+      inputs.self.nixosModules.microvm
+      inputs.self.nixosModules.x86_64-hw-laptop
+      inputs.self.nixosModules.disko-debug-partition
       ./laptop-x86.nix
-      inputs.self.nixosModules.hw-laptop
     ];
   };
 }

modules/profiles/flake-module.nix

@@ -0,0 +1,20 @@
+# Copyright 2022-2025 TII (SSRC) and the Ghaf contributors
+# SPDX-License-Identifier: Apache-2.0
+#
+# Ghaf Reference Profiles
+#
+{ inputs, ... }:
+{
+  flake.nixosModules = {
+    # Top level profiles
+    reference-profile-mvp-user-trials.imports = [
+      inputs.self.nixosModules.profiles
+      inputs.self.nixosModules.profiles-laptop
+      ./mvp-user-trial.nix
+    ];
+    reference-profile-mvp-user-trials-extras.imports = [
+      inputs.self.nixosModules.reference-profile-mvp-user-trials
+      ./mvp-user-trial-extras.nix
+    ];
+  };
+}

modules/reference/profiles/default.nix

@@ -1,23 +1,10 @@
 # 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 {
+  config = {
     ghaf = {
       reference = {
-        profiles = {
-          mvp-user-trial.enable = true;
-        };
-
         programs = {
           windows-launcher = {
             enable = true;

modules/reference/profiles/flake-module.nix

@@ -1,9 +1,6 @@
 # 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;
-in
 {
   imports = [
     ../appvms
@@ -13,11 +10,7 @@ in
     ../desktop
   ];
 
-  options.ghaf.reference.profiles.mvp-user-trial = {
-    enable = lib.mkEnableOption "Enable the mvp configuration for apps and services";
-  };
-
-  config = lib.mkIf cfg.enable {
+  config = {
     ghaf = {
       # Enable below option for session lock feature
       graphics = {