From 8595762c7bccc904f1549c89b6d5b6569f4b8d87 Mon Sep 17 00:00:00 2001
From: arcnmx <git@git.arcn.mx>
Date: Thu, 25 Sep 2025 15:11:20 -0700
Subject: [PATCH] fix(nixos): compatibility updates

---
 nixos/base/time.nix   | 9 +++++++--
 nixos/postgres.nix    | 2 +-
 nixos/zigbee2mqtt.nix | 1 +
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/nixos/base/time.nix b/nixos/base/time.nix
index 988ff045..e7185e5a 100644
--- a/nixos/base/time.nix
+++ b/nixos/base/time.nix
@@ -1,5 +1,10 @@
-{lib, ...}: let
-  inherit (lib.modules) mkDefault;
+{config, lib, gensokyo-zone, ...}: let
+  inherit (lib.modules) mkIf mkDefault;
+  inherit (gensokyo-zone.lib) mkAlmostForce;
 in {
   time.timeZone = mkDefault "America/Vancouver";
+
+  services.ntp = mkIf config.boot.isContainer {
+    enable = mkAlmostForce false;
+  };
 }
diff --git a/nixos/postgres.nix b/nixos/postgres.nix
index 7752f768..72035be5 100644
--- a/nixos/postgres.nix
+++ b/nixos/postgres.nix
@@ -56,7 +56,7 @@ in {
     services.postgresql = mkIf cfg.enable {
       gensokyo-zone.sharedMounts."postgresql/${versions.major cfg.package.version}".path = cfg.dataDir;
       postStart = mkAfter ''
-        $PSQL -tAf ${config.sops.secrets.postgresql-init.path}
+        ''${PSQL-psql} -tAf ${config.sops.secrets.postgresql-init.path}
       '';
     };
   };
diff --git a/nixos/zigbee2mqtt.nix b/nixos/zigbee2mqtt.nix
index a64c1aef..1c159773 100644
--- a/nixos/zigbee2mqtt.nix
+++ b/nixos/zigbee2mqtt.nix
@@ -42,6 +42,7 @@ in {
         port = 8072;
       };
       serial = {
+        adapter = "zstack";
         port = "/dev/ttyZigbee";
       };
       availability = {