Services are ready

modules/services/home-assistant.nix

@@ -24,6 +24,50 @@ helper.mkPodmanService {
     "100999:users ${cfg.configDir}/mqtt"
   ];
 
+# Compose file good
+  composeText = ''
+    services:
+      home-assistant:
+        image: ghcr.io/home-assistant/home-assistant:${homeAssistantVersion}
+        container_name: home-assistant
+        hostname: home-assistant
+        networks:
+          home-assistant:
+        ports:
+          - "${cfg.port}:8123/tcp"
+        volumes:
+          - ${cfg.configDir}/home-assistant:/config
+          - /etc/localtime:/etc/localtime:ro
+          - /run/dbus:/run/dbus:ro
+${lib.optionalString (cfg.devices != []) ''
+        devices:
+${lib.concatStringsSep "\n" (map (d: "        - \"${d}\"") cfg.devices)}
+''}
+        security_opt:
+          - no-new-privileges:true
+        cap_drop:
+          - NET_RAW
+        restart: unless-stopped
+      home-assistant-mqtt:
+        image: docker.io/library/eclipse-mosquitto:${mqttVersion}
+        container_name: home-assistant-mqtt
+        hostname: home-assistant-mqtt
+        user: '1000:1000'
+        networks:
+          home-assistant:
+        volumes:
+          - ${cfg.configDir}/mqtt:/mosquitto
+        security_opt:
+          - no-new-privileges:true
+        cap_drop:
+          - NET_RAW
+        restart: unless-stopped
+    networks:
+      home-assistant:
+        name: home-assistant
+        driver: bridge
+  '';
+
   extraOptions = {
     devices = mkOption {
       type = types.listOf types.str;
@@ -83,7 +127,7 @@ EOF
       };
       script = ''
         mkdir -p /var/lib/numbus-server/${name}
-        if [[ -e /var/lib/numbus-server/${name}/quirk.true ]]; then
+        if [[ -e /var/lib/numbus-server/${name}/quirk-2.true ]]; then
           exit 0
         fi
         cat << EOF >> ${cfg.configDir}/mqtt/mosquitto.conf
@@ -98,51 +142,7 @@ EOF
         source /var/lib/numbus-server/${name}/.env
         mosquitto_passwd -b ${cfg.configDir}/mqtt/password.txt "$HOME_ASSISTANT_MQTT_USER" "$HOME_ASSISTANT_MQTT_PASSWORD"
         chmod 600 ${cfg.configDir}/mqtt/password.txt
-        touch /var/lib/numbus-server/${name}/quirk.true
+        touch /var/lib/numbus-server/${name}/quirk-2.true
       '';
     };
-
-# Compose file good
-  composeText = ''
-    services:
-      home-assistant:
-        image: ghcr.io/home-assistant/home-assistant:${homeAssistantVersion}
-        container_name: home-assistant
-        hostname: home-assistant
-        networks:
-          home-assistant:
-        ports:
-          - "${cfg.port}:8123/tcp"
-        volumes:
-          - ${cfg.configDir}/home-assistant:/config
-          - /etc/localtime:/etc/localtime:ro
-          - /run/dbus:/run/dbus:ro
-${lib.optionalString (cfg.devices != []) ''
-        devices:
-${lib.concatStringsSep "\n" (map (d: "        - \"${d}\"") cfg.devices)}
-''}
-        security_opt:
-          - no-new-privileges:true
-        cap_drop:
-          - NET_RAW
-        restart: unless-stopped
-      home-assistant-mqtt:
-        image: docker.io/library/eclipse-mosquitto:${mqttVersion}
-        container_name: home-assistant-mqtt
-        hostname: home-assistant-mqtt
-        user: '1000:1000'
-        networks:
-          home-assistant:
-        volumes:
-          - ${cfg.configDir}/mqtt:/mosquitto
-        security_opt:
-          - no-new-privileges:true
-        cap_drop:
-          - NET_RAW
-        restart: unless-stopped
-    networks:
-      home-assistant:
-        name: home-assistant
-        driver: bridge
-  '';
 }