Use config time for the timeZone

Signed-off-by: Brian McGillion <bmg.avoin@gmail.com>
tiiuae · Jun 12, 2024 · ae44f59 · ae44f59
1 parent b470c5f
commit ae44f59
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/modules/microvm/virtualization/microvm/audiovm.nix b/modules/microvm/virtualization/microvm/audiovm.nix
@@ -19,7 +19,7 @@
         pkgs,
         ...
       }: {
-        time.timeZone = "Asia/Dubai";
+        time.timeZone = config.time.timeZone;
         ghaf = {
           users.accounts.enable = lib.mkDefault configHost.ghaf.users.accounts.enable;
           profiles.debug.enable = lib.mkDefault configHost.ghaf.profiles.debug.enable;

diff --git a/modules/reference/appvms/chromium.nix b/modules/reference/appvms/chromium.nix
@@ -55,7 +55,7 @@ in {
         '';
       };
 
-      time.timeZone = "Asia/Dubai";
+      time.timeZone = config.time.timeZone;
 
       microvm.qemu.extraArgs = lib.optionals config.ghaf.hardware.usb.internal.enable config.ghaf.hardware.usb.internal.qemuExtraArgs.webcam;
       microvm.devices = [];

diff --git a/modules/reference/appvms/default.nix b/modules/reference/appvms/default.nix
@@ -32,7 +32,7 @@ in {
       enabled-app-vms =
         (lib.optionals cfg.chromium-vm [(import ./chromium.nix {inherit pkgs lib config;})])
         ++ (lib.optionals cfg.gala-vm [(import ./gala.nix {inherit pkgs lib config;})])
-        ++ (lib.optionals cfg.zathura-vm [(import ./zathura.nix {inherit pkgs;})])
+        ++ (lib.optionals cfg.zathura-vm [(import ./zathura.nix {inherit pkgs config;})])
         ++ (lib.optionals cfg.element-vm [(import ./element.nix {inherit pkgs lib config;})])
         ++ (lib.optionals cfg.appflowy-vm [(import ./appflowy.nix {inherit pkgs config;})]);
     };

diff --git a/modules/reference/appvms/element.nix b/modules/reference/appvms/element.nix
@@ -76,7 +76,7 @@ in {
         firewall.allowedUDPPorts = [dendrite-pinecone.McastUdpPortInt];
       };
 
-      time.timeZone = "${config.time.timeZone}";
+      time.timeZone = config.time.timeZone;
 
       services.gpsd = {
         enable = true;

diff --git a/modules/reference/appvms/zathura.nix b/modules/reference/appvms/zathura.nix
@@ -1,7 +1,11 @@
 # Copyright 2024 TII (SSRC) and the Ghaf contributors
 # SPDX-License-Identifier: Apache-2.0
 #
-{pkgs, ...}: {
+{
+  pkgs,
+  config,
+  ...
+}: {
   name = "zathura";
   packages = [pkgs.zathura];
   macAddress = "02:00:00:03:07:01";
@@ -10,7 +14,7 @@
   extraModules = [
     {
       imports = [../programs/zathura.nix];
-      time.timeZone = "Asia/Dubai";
+      time.timeZone = config.time.timeZone;
       ghaf.programs.zathura.enable = true;
     }
   ];

diff --git a/targets/lenovo-x1/guivmExtraModules.nix b/targets/lenovo-x1/guivmExtraModules.nix
@@ -119,7 +119,7 @@
       };
     };
 
-    time.timeZone = "Asia/Dubai";
+    time.timeZone = configH.time.timeZone;
 
     # PDF XDG handler service receives a PDF file path from the chromium-vm and executes the openpdf script
     systemd.user = {

diff --git a/targets/lenovo-x1/netvmExtraModules.nix b/targets/lenovo-x1/netvmExtraModules.nix
@@ -93,7 +93,7 @@
       systemPackages = lib.mkIf configH.ghaf.profiles.debug.enable [pkgs.wifi-connector-nmcli pkgs.tcpdump];
     };
 
-    time.timeZone = "Asia/Dubai";
+    time.timeZone = configH.time.timeZone;
 
     ghaf.services.dendrite-pinecone = {
       enable = true;