1 files changed, 37 insertions, 3 deletions
diff --git a/nixos/configurations/spt-omnia.nix b/nixos/configurations/spt-omnia.nix
index e55e34f..1809b2a 100644
--- a/nixos/configurations/spt-omnia.nix
+++ b/nixos/configurations/spt-omnia.nix
@@ -1,6 +1,7 @@
 {config, ...}: let
   hosts = config.cynerd.hosts.spt;
 in {
+  system.stateVersion = "24.05";
   turris.board = "omnia";
   deploy = {
     enable = true;
@@ -28,7 +29,7 @@ in {
         channel = 11;
       };
       qca988x = {
-        interface = "wlp3s0";
+        interface = "wlp2s0";
         bssids = config.secrets.wifiMacs.spt-omnia.qca988x;
         channel = 36;
       };
@@ -121,10 +122,43 @@ in {
       password metronet
     '';
   };
-  systemd.services."pppd-wan".after = ["sys-subsystem-net-devices-end2.848.device"];
+  systemd.services."pppd-wan" = {
+    after = ["sys-subsystem-net-devices-end2.848.device"];
+    partOf = ["systemd-networkd.service"];
+  };
   # TODO limit NSS clamping to just pppoe-wan
   networking.firewall.extraForwardRules = ''
     tcp flags syn tcp option maxseg size set rt mtu comment "Needed for PPPoE to fix IPv4"
-    iifname {"home", "personalvpn", "wg"} oifname {"home", "personalvpn", "wg"} accept
+    iifname {"home", "wg"} oifname {"home", "wg"} accept
   '';
+
+  ##############################################################################
+  services = {
+    zigbee2mqtt = {
+      enable = true;
+      settings = {
+        serial.port = "/dev/serial/by-id/usb-ITEAD_SONOFF_Zigbee_3.0_USB_Dongle_Plus_V2_20220812153849-if00";
+        mqtt = {
+          server = "mqtt://${config.cynerd.hosts.spt.mox}:1883";
+          user = "zigbee2mqtt";
+          password = "!secret.yaml mqtt_password";
+        };
+        advanced = {
+          network_key = "!secret.yaml network_key";
+          homeassistant_legacy_entity_attributes = false;
+          legacy_api = false;
+          legacy_availability_payload = false;
+          last_seen = "epoch";
+        };
+        frontend = true;
+        availability = true;
+        homeassistant = {
+          legacy_triggers = false;
+        };
+        device_options.legacy = false;
+        permit_join = false;
+        devices = config.secrets.zigbee2mqttDevices;
+      };
+    };
+  };
 }