fix: formatting according and statix

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

Author: brianmcgillion

modules/common/global-config.nix

@@ -30,21 +30,23 @@
   };
 
   config = {
-    # Populate platform information from host config
-    ghaf.global-config.platform = {
-      buildSystem = lib.mkDefault config.nixpkgs.buildPlatform.system;
-      hostSystem = lib.mkDefault config.nixpkgs.hostPlatform.system;
-      timeZone = lib.mkDefault (if config.time.timeZone != null then config.time.timeZone else "UTC");
-    };
+    ghaf.global-config = {
+      # Populate platform information from host config
+      platform = {
+        buildSystem = lib.mkDefault config.nixpkgs.buildPlatform.system;
+        hostSystem = lib.mkDefault config.nixpkgs.hostPlatform.system;
+        timeZone = lib.mkDefault (if config.time.timeZone != null then config.time.timeZone else "UTC");
+      };
 
-    # Propagate host storeOnDisk setting to global-config for VMs
-    ghaf.global-config.storage.storeOnDisk = lib.mkIf config.ghaf.virtualization.microvm.storeOnDisk true;
+      # Propagate host storeOnDisk setting to global-config for VMs
+      storage.storeOnDisk = lib.mkIf config.ghaf.virtualization.microvm.storeOnDisk true;
 
-    # Auto-populate logging listener address from admin-vm IP
-    # The logging listener always runs on admin-vm, so derive the address
-    # from hosts.nix rather than requiring each profile to set it manually.
-    ghaf.global-config.logging.listener.address = lib.mkIf (
-      config.ghaf.global-config.logging.enable && config.ghaf.common.adminHost != null
-    ) (lib.mkDefault config.ghaf.networking.hosts.admin-vm.ipv4);
+      # Auto-populate logging listener address from admin-vm IP
+      # The logging listener always runs on admin-vm, so derive the address
+      # from hosts.nix rather than requiring each profile to set it manually.
+      logging.listener.address = lib.mkIf (
+        config.ghaf.global-config.logging.enable && config.ghaf.common.adminHost != null
+      ) (lib.mkDefault config.ghaf.networking.hosts.admin-vm.ipv4);
+    };
   };
 }

modules/profiles/laptop-x86.nix

@@ -217,8 +217,8 @@ in
             vmCfg = config.ghaf.virtualization.vmConfig.appvms.${vmDef.name} or { };
             effectiveDef =
               vmDef
-              // lib.optionalAttrs (vmCfg.ramMb or null != null) { inherit (vmCfg) ramMb; }
-              // lib.optionalAttrs (vmCfg.cores or null != null) { inherit (vmCfg) cores; };
+              // lib.optionalAttrs (vmCfg ? ramMb) { inherit (vmCfg) ramMb; }
+              // lib.optionalAttrs (vmCfg ? cores) { inherit (vmCfg) cores; };
           in
           lib.nixosSystem {
             modules = [

modules/reference/hardware/flake-module.nix

@@ -40,9 +40,11 @@
       {
         ghaf.hardware = {
           passthrough = {
-            pci.autoDetectGpu = true;
-            pci.autoDetectNet = true;
-            pci.autoDetectAudio = true;
+            pci = {
+              autoDetectGpu = true;
+              autoDetectNet = true;
+              autoDetectAudio = true;
+            };
             pciAcsOverride = {
               enable = true;
               ids = [

modules/reference/profiles/mvp-user-trial.nix

@@ -102,20 +102,22 @@ in
               # Reference services and personalization
               ../services
               ../personalize
-              { ghaf.reference.personalize.keys.enable = true; }
               # Forward host reference services config to netvm
               {
-                ghaf.reference.services = {
-                  inherit (config.ghaf.reference.services)
-                    enable
-                    dendrite
-                    proxy-business
-                    ;
-                  google-chromecast = {
-                    inherit (config.ghaf.reference.services.google-chromecast) enable vmName;
-                  };
-                  chromecast = {
-                    inherit (config.ghaf.reference.services.chromecast) externalNic internalNic;
+                ghaf.reference = {
+                  personalize.keys.enable = true;
+                  services = {
+                    inherit (config.ghaf.reference.services)
+                      enable
+                      dendrite
+                      proxy-business
+                      ;
+                    google-chromecast = {
+                      inherit (config.ghaf.reference.services.google-chromecast) enable vmName;
+                    };
+                    chromecast = {
+                      inherit (config.ghaf.reference.services.chromecast) externalNic internalNic;
+                    };
                   };
                 };
               }