1 files changed, 19 insertions, 37 deletions

diff --git a/nixos/configurations/spt-omnia.nix b/nixos/configurations/spt-omnia.nix
index 1809b2a..8449f0d 100644
--- a/nixos/configurations/spt-omnia.nix
+++ b/nixos/configurations/spt-omnia.nix
@@ -15,6 +15,7 @@ in {
       lanIP = hosts.omnia;
       staticLeases = {
         "a8:a1:59:10:32:c4" = hosts.errol;
+        "70:85:c2:4a:59:f2" = hosts.ridcully;
         "7c:b0:c2:bb:9c:ca" = hosts.albert;
         "4c:d5:77:0d:85:d9" = hosts.binky;
         "b8:27:eb:57:a2:31" = hosts.mpd;
@@ -38,18 +39,20 @@ in {
     monitoring.speedtest = true;
   };
 
-  services.journald.extraConfig = ''
-    SystemMaxUse=8G
-  '';
+  services = {
+    journald.extraConfig = ''
+      SystemMaxUse=8G
+    '';
 
-  services.btrfs.autoScrub = {
-    enable = true;
-    fileSystems = ["/"];
-  };
+    btrfs.autoScrub = {
+      enable = true;
+      fileSystems = ["/"];
+    };
 
-  services.fail2ban = {
-    enable = true;
-    ignoreIP = ["10.8.1.0/24" "10.8.2.0/24"];
+    fail2ban = {
+      enable = true;
+      ignoreIP = ["10.8.1.0/24" "10.8.2.0/24"];
+    };
   };
 
   networking.useDHCP = false;
@@ -133,32 +136,11 @@ in {
   '';
 
   ##############################################################################
-  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;
-      };
-    };
+  cynerd.ha = {
+    enable = true;
+    domain = "spt.cynerd.cz";
+    extraOptions = [
+      "--device=/dev/serial/by-id/usb-ITEAD_SONOFF_Zigbee_3.0_USB_Dongle_Plus_V2_20220812153849-if00:/dev/ttyACM0"
+    ];
   };
 }