last alignment fixes

Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>

Author: brianmcgillion

lib/global-config.nix

@@ -172,6 +172,12 @@ rec {
           default = "";
           description = "Shared memory server socket path";
         };
+
+        flataddr = mkOption {
+          type = types.str;
+          default = "0x920000000";
+          description = "Maps the shared memory to a physical address for kvm_ivshmem";
+        };
       };
 
       # Graphics/boot UI settings
@@ -672,9 +678,10 @@ rec {
         # User configuration (complex, kept as-is for now)
         users = config.ghaf.users or { };
 
-        # Reference services (profile-specific)
+        # Reference config (profile-specific)
         reference = {
           services = config.ghaf.reference.services or { };
+          desktop = config.ghaf.reference.desktop or { };
         };
 
         # Networking info (IP addresses, CIDs, etc. for this VM and others)

modules/desktop/guivm/default.nix

@@ -15,10 +15,10 @@
 #     }
 #
 # Feature modules auto-include based on:
-#   - boot-ui.nix: ghaf.graphics.boot.enable
-#   - shared-folders.nix: ghaf.storagevm.shared-folders.enable
-#   - shared-mem.nix: ghaf.virtualization.microvm.sharedMem.enable
-#   - ghaf-intro.nix: ghaf.reference.services.ghaf-intro.enable
+#   - boot-ui.nix: globalConfig.graphics.boot.enable
+#   - shared-folders.nix: config.ghaf.storagevm.shared-folders.enable (VM-local)
+#   - shared-mem.nix: globalConfig.shm.enable
+#   - ghaf-intro.nix: hostConfig.reference.desktop.ghaf-intro.enable
 #
 # Note: Waypipe configuration is not included here as it requires host-level
 # access to microvm.vms for iterating over AppVMs. It's contributed via

modules/desktop/guivm/ghaf-intro.nix

@@ -6,23 +6,23 @@
 # This module configures the first-boot Ghaf introduction autostart service.
 # It watches for COSMIC initial setup completion and launches the intro app.
 #
-# This module is auto-included when ghaf.reference.services.ghaf-intro.enable is true.
+# This module is auto-included when ghaf-intro is enabled in the reference desktop config.
 #
 {
   lib,
   pkgs,
-  globalConfig,
+  hostConfig,
   ...
 }:
 let
-  # Only enable if ghaf-intro service is enabled in globalConfig
-  ghafIntroEnabled = globalConfig.reference.services.ghaf-intro.enable or false;
+  # Only enable if ghaf-intro is enabled in the host's reference desktop config
+  ghafIntroEnabled = hostConfig.reference.desktop.ghaf-intro.enable or false;
 
-  # Get the intro command from reference services config
+  # Launch ghaf-intro in chrome-vm via givc-cli (it's a Chrome-based app)
   introCommand =
     let
       wrapper = pkgs.writeShellScriptBin "ghaf-intro-autostart" ''
-        ${pkgs.ghaf-intro}/bin/ghaf-intro
+        ${pkgs.givc-cli}/bin/givc-cli ${hostConfig.givc.cliArgs or ""} start app --vm chrome-vm ghaf-intro
       '';
     in
     "${lib.getExe wrapper}";

modules/desktop/guivm/shared-folders.nix

@@ -7,17 +7,18 @@
 # change notifications. This allows the file manager to automatically
 # refresh when files change in shared folders.
 #
-# This module is auto-included when ghaf.storagevm.shared-folders.enable is true.
+# This module is auto-included when config.ghaf.storagevm.shared-folders.enable is true.
 #
 {
+  config,
   lib,
   pkgs,
-  globalConfig,
   ...
 }:
 let
-  # Only enable if shared folders are enabled in globalConfig
-  sharedFoldersEnabled = globalConfig.storagevm.shared-folders.enable or false;
+  # Only enable if shared folders are enabled in the VM's own config
+  # (set by guivm-base.nix: ghaf.storagevm.shared-folders.enable = true)
+  sharedFoldersEnabled = config.ghaf.storagevm.shared-folders.enable or false;
 in
 {
   _file = ./shared-folders.nix;

modules/desktop/guivm/shared-mem.nix

@@ -6,7 +6,7 @@
 # This module configures kernel parameters for kvm_ivshmem shared memory
 # communication between VMs.
 #
-# This module is auto-included when ghaf.virtualization.microvm.sharedMem.enable is true.
+# This module is auto-included when globalConfig.shm.enable is true.
 #
 {
   lib,
@@ -15,8 +15,8 @@
 }:
 let
   # Only enable if shared memory is enabled in globalConfig
-  sharedMemEnabled = globalConfig.virtualization.microvm.sharedMem.enable or false;
-  flataddr = globalConfig.virtualization.microvm.sharedMem.flataddr or "0x220000000";
+  sharedMemEnabled = globalConfig.shm.enable or false;
+  flataddr = globalConfig.shm.flataddr or "0x920000000";
 in
 {
   _file = ./shared-mem.nix;

modules/microvm/appvm.nix

@@ -210,7 +210,7 @@ in
                 "high"
               ];
               description = "Boot priority for the VM (affects systemd ordering)";
-              default = "low";
+              default = "medium";
             };
           };
         }