Enable GIVC and logging for nvidia targets

Signed-off-by: vadik likholetov <vadikas@gmail.com>

Author: vadika

lib/builders/mkGhafConfiguration.nix

@@ -34,6 +34,7 @@
 #   extraModules   - Additional NixOS modules for the host (default: [])
 #   extraConfig    - Additional ghaf.* configuration (default: {})
 #   vmConfig       - VM resource allocation and modules (default: {})
+#   globalConfigOverrides - Overrides merged into variant global-config (default: {})
 #                    Maps to ghaf.virtualization.vmConfig
 #
 # Output:
@@ -64,6 +65,7 @@ let
       extraModules ? [ ],
       extraConfig ? { },
       vmConfig ? { },
+      globalConfigOverrides ? { },
     }:
     let
       # Select the profile module based on target type
@@ -106,22 +108,21 @@ let
       # Variant configuration (debug/release profiles)
       # Sets both:
       # 1. ghaf.profiles.{debug,release}.enable for host-side module activation
-      # 2. ghaf.global-config to the corresponding profile for VM-side config propagation
+      # 2. ghaf.global-config to the corresponding profile for VM-side config propagation,
+      #    merged with per-target globalConfigOverrides
       #
-      # Note: global-config uses mkDefault so that platform-specific profiles (like orin.nix)
-      # can override specific values. For example, orin.nix sets ghaf.givc.enable = false
-      # and this should propagate to VMs via ghaf.global-config.givc.enable.
+      # Note: global-config uses mkDefault so target modules can still override specific
+      # values when needed.
+      baseGlobalConfig = lib.ghaf.profiles.${variant} or lib.ghaf.profiles.minimal;
+      mergedGlobalConfig = lib.recursiveUpdate baseGlobalConfig globalConfigOverrides;
+
       variantModule = {
         ghaf.profiles = {
           debug.enable = variant == "debug";
           release.enable = variant == "release";
         };
-        # Set global-config to match the variant's profile using mkDefault
-        # This allows profile modules to override specific global-config values
-        # Example: orin.nix can set ghaf.global-config.givc.enable = false
-        ghaf.global-config = lib.mapAttrsRecursive (_: v: lib.mkDefault v) (
-          lib.ghaf.profiles.${variant} or lib.ghaf.profiles.minimal
-        );
+        # Set global-config to the selected variant profile merged with target overrides.
+        ghaf.global-config = lib.mapAttrsRecursive (_: v: lib.mkDefault v) mergedGlobalConfig;
       };
 
       # Build the host NixOS configuration
@@ -164,6 +165,7 @@ let
             variant
             extraConfig
             vmConfig
+            globalConfigOverrides
             ;
           extraModules = extraModules ++ modules;
         };
@@ -180,6 +182,7 @@ let
             variant
             extraModules
             extraConfig
+            globalConfigOverrides
             ;
           vmConfig = vmConfig // {
             ${vmName} = (vmConfig.${vmName} or { }) // {

modules/profiles/orin.nix

@@ -209,13 +209,6 @@ in
         nvidia-docker.daemon.enable = true;
       };
 
-      # Disable givc on Orin - GIVC requires TLS certificate infrastructure
-      # that isn't set up for Orin devices. This must be set in both:
-      # 1. ghaf.givc.enable (host-level option)
-      # 2. ghaf.global-config.givc.enable (propagates to VMs via specialArgs)
-      givc.enable = false;
-      global-config.givc.enable = false;
-
       host.networking = {
         enable = true;
       };

targets/nvidia-jetson-orin/flake-module.nix

@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2022-2026 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 #
-# Configuration for NVIDIA Jetson Orin AGX/NX
+#  Configuration for NVIDIA Jetson Orin AGX/NX
 #
 {
   lib,
@@ -42,8 +42,29 @@ let
     self.nixosModules.reference-host-demo-apps
     self.nixosModules.reference-profiles-orin
     self.nixosModules.profiles
+    (
+      { config, ... }:
+      {
+        ghaf.givc.enable = true;
+        ghaf.givc.debug = false;
+
+        ghaf.logging = {
+          enable = true;
+          server.endpoint = "https://loki.ghaflogs.vedenemo.dev/loki/api/v1/push";
+          listener.address = config.ghaf.networking.hosts.admin-vm.ipv4;
+        };
+      }
+    )
   ];
 
+  orinGlobalConfigOverrides = {
+    givc.enable = true;
+    logging = {
+      enable = true;
+      server.endpoint = "https://loki.ghaflogs.vedenemo.dev/loki/api/v1/push";
+    };
+  };
+
   # All Orin configurations using mkGhafConfiguration
   target-configs = [
     # ============================================================
@@ -56,6 +77,7 @@ let
       profile = "orin";
       hardwareModule = self.nixosModules.hardware-nvidia-jetson-orin-agx;
       variant = "debug";
+      globalConfigOverrides = orinGlobalConfigOverrides;
       extraModules = commonModules;
       extraConfig = {
         reference.profiles.mvp-orinuser-trial.enable = true;
@@ -68,6 +90,7 @@ let
       profile = "orin";
       hardwareModule = self.nixosModules.hardware-nvidia-jetson-orin-agx64;
       variant = "debug";
+      globalConfigOverrides = orinGlobalConfigOverrides;
       extraModules = commonModules;
       extraConfig = {
         reference.profiles.mvp-orinuser-trial.enable = true;
@@ -80,6 +103,7 @@ let
       profile = "orin";
       hardwareModule = self.nixosModules.hardware-nvidia-jetson-orin-agx-industrial;
       variant = "debug";
+      globalConfigOverrides = orinGlobalConfigOverrides;
       extraModules = commonModules;
       extraConfig = {
         reference.profiles.mvp-orinuser-trial.enable = true;
@@ -92,6 +116,7 @@ let
       profile = "orin";
       hardwareModule = self.nixosModules.hardware-nvidia-jetson-orin-nx;
       variant = "debug";
+      globalConfigOverrides = orinGlobalConfigOverrides;
       extraModules = commonModules;
       extraConfig = {
         reference.profiles.mvp-orinuser-trial.enable = true;
@@ -108,6 +133,7 @@ let
       profile = "orin";
       hardwareModule = self.nixosModules.hardware-nvidia-jetson-orin-agx;
       variant = "release";
+      globalConfigOverrides = orinGlobalConfigOverrides;
       extraModules = commonModules;
       extraConfig = {
         reference.profiles.mvp-orinuser-trial.enable = true;
@@ -120,6 +146,7 @@ let
       profile = "orin";
       hardwareModule = self.nixosModules.hardware-nvidia-jetson-orin-agx64;
       variant = "release";
+      globalConfigOverrides = orinGlobalConfigOverrides;
       extraModules = commonModules;
       extraConfig = {
         reference.profiles.mvp-orinuser-trial.enable = true;
@@ -132,6 +159,7 @@ let
       profile = "orin";
       hardwareModule = self.nixosModules.hardware-nvidia-jetson-orin-agx-industrial;
       variant = "release";
+      globalConfigOverrides = orinGlobalConfigOverrides;
       extraModules = commonModules;
       extraConfig = {
         reference.profiles.mvp-orinuser-trial.enable = true;
@@ -144,6 +172,7 @@ let
       profile = "orin";
       hardwareModule = self.nixosModules.hardware-nvidia-jetson-orin-nx;
       variant = "release";
+      globalConfigOverrides = orinGlobalConfigOverrides;
       extraModules = commonModules;
       extraConfig = {
         reference.profiles.mvp-orinuser-trial.enable = true;