From 47d1036c428455f516f4be7f152228be257907ef Mon Sep 17 00:00:00 2001
From: arcnmx <git@git.arcn.mx>
Date: Tue, 16 Jan 2024 10:12:17 -0800
Subject: [PATCH] chore: clean up after tewi

---
 modules/nixos/cockroachdb.nix | 11 +++++++++++
 nixos/systemd2mqtt.nix        |  5 +++--
 nixos/zigbee2mqtt.nix         |  5 +++--
 systems/tewi/nixos.nix        |  5 -----
 4 files changed, 17 insertions(+), 9 deletions(-)
 create mode 100644 modules/nixos/cockroachdb.nix

diff --git a/modules/nixos/cockroachdb.nix b/modules/nixos/cockroachdb.nix
new file mode 100644
index 00000000..d2cb8674
--- /dev/null
+++ b/modules/nixos/cockroachdb.nix
@@ -0,0 +1,11 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib.modules) mkDefault;
+in {
+  config.services.cockroachdb = {
+    locality = mkDefault "provider=local,network=gensokyo,host=${config.networking.hostName}";
+  };
+}
diff --git a/nixos/systemd2mqtt.nix b/nixos/systemd2mqtt.nix
index a6d10aa1..dff7e79a 100644
--- a/nixos/systemd2mqtt.nix
+++ b/nixos/systemd2mqtt.nix
@@ -10,8 +10,9 @@ in {
     enable = mkDefault true;
     user = mkDefault "root";
     mqtt = {
-      url = mkIf config.services.mosquitto.enable (
-        mkDefault "tcp://localhost:1883"
+      url = mkDefault (if config.services.mosquitto.enable
+        then "tcp://localhost:1883"
+        else "tcp://mqtt.local.${config.networking.domain}:1883"
       );
       username = mkDefault "systemd";
     };
diff --git a/nixos/zigbee2mqtt.nix b/nixos/zigbee2mqtt.nix
index c9a2b9f2..c3e859ff 100644
--- a/nixos/zigbee2mqtt.nix
+++ b/nixos/zigbee2mqtt.nix
@@ -11,8 +11,6 @@ in {
     path = "${cfg.dataDir}/secret.yaml";
   };
 
-  users.groups.input.members = [ "zigbee2mqtt" ];
-
   services.zigbee2mqtt = {
     enable = mkDefault true;
     domain = mkDefault "z2m.${config.networking.domain}";
@@ -24,6 +22,9 @@ in {
       mqtt = {
         user = "z2m";
         password = "!secret z2m_pass";
+        server = mkIf (!config.services.mosquitto.enable) (
+          mkDefault "mqtt://mqtt.local.${config.networking.domain}:1883"
+        );
       };
       homeassistant = true;
       permit_join = false;
diff --git a/systems/tewi/nixos.nix b/systems/tewi/nixos.nix
index 9a07f704..f785b568 100644
--- a/systems/tewi/nixos.nix
+++ b/systems/tewi/nixos.nix
@@ -13,11 +13,6 @@
       nixos.tailscale
     ];
 
-  services.udev.extraRules = ''
-    SUBSYSTEM=="tty", GROUP="input", MODE="0660"
-  '';
-
-  services.cockroachdb.locality = "provider=local,network=gensokyo,host=${config.networking.hostName}";
   services.kanidm.serverSettings.db_fs_type = "zfs";
   services.tailscale.advertiseExitNode = true;
   services.postgresql.package = pkgs.postgresql_14;