refactor(mosquitto): move to utsuho

systems/hakurei/nixos.nix

@@ -11,8 +11,8 @@
   tei = access.nixosFor "tei";
   utsuho = access.nixosFor "utsuho";
   inherit (mediabox.services) plex;
-  inherit (tei.services) home-assistant zigbee2mqtt mosquitto;
-  inherit (utsuho.services) unifi;
+  inherit (tei.services) home-assistant zigbee2mqtt;
+  inherit (utsuho.services) unifi mosquitto;
   inherit (config.services) nginx;
   inherit (nginx) virtualHosts;
 in {
@@ -225,7 +225,7 @@ in {
   in {
     vouch.enableLocal = false;
     access.mosquitto = assert mosquitto.enable; {
-      host = getHostnameFor "tei" "lan";
+      host = getHostnameFor "utsuho" "lan";
     };
     access.plex = assert plex.enable; {
       url = "http://${getHostnameFor "mediabox" "lan"}:${toString plex.port}";

systems/tei/lxc.json

@@ -3,7 +3,6 @@
 		"lxc.mount.entry": [
 			"/rpool/caches/zigbee2mqtt mnt/caches/zigbee2mqtt none bind,optional,create=dir",
 			"/rpool/shared/zigbee2mqtt mnt/shared/zigbee2mqtt none bind,optional,create=dir",
-			"/rpool/shared/mosquitto mnt/shared/mosquitto none bind,optional,create=dir",
 			"/rpool/shared/hass mnt/shared/hass none bind,optional,create=dir",
 			"/rpool/shared/grocy mnt/shared/grocy none bind,optional,create=dir",
 			"/rpool/shared/barcodebuddy mnt/shared/barcodebuddy none bind,optional,create=dir",

systems/tei/nixos.nix

@@ -1,12 +1,8 @@
 {
   config,
-  lib,
   meta,
   ...
-}: let
-  inherit (lib.modules) mkIf mkMerge;
-  inherit (config.services) mosquitto home-assistant;
-in {
+}: {
   imports = let
     inherit (meta) nixos;
   in [
@@ -19,7 +15,6 @@ in {
     nixos.access.zigbee2mqtt
     nixos.access.grocy
     nixos.access.barcodebuddy
-    nixos.mosquitto
     nixos.home-assistant
     nixos.zigbee2mqtt
     nixos.syncplay
@@ -38,18 +33,5 @@ in {
 
   sops.defaultSopsFile = ./secrets.yaml;
 
-  networking.firewall = {
-    interfaces.local.allowedTCPPorts = mkMerge [
-      (mkIf home-assistant.enable [
-        home-assistant.config.http.server_port
-      ])
-      (mkIf mosquitto.enable (map (
-          listener:
-            listener.port
-        )
-        mosquitto.listeners))
-    ];
-  };
-
   system.stateVersion = "23.11";
 }

systems/utsuho/nixos.nix

@@ -14,6 +14,7 @@ in {
     nixos.access.unifi
     nixos.unifi
     nixos.dnsmasq
+    nixos.mosquitto
   ];
 
   services.cloudflared = let