fix: Deploy requires login now

This adds a toolchain setup step to the base image so we do not have to
do it multiple times

.gitea/workflows/build.yml

@@ -9,10 +9,10 @@ on:
 
 jobs:
     build:
-        uses: dreaded_x/workflows/.gitea/workflows/rust-kubernetes.yaml@22ee0c1788a8d2157db87d6a6f8dbe520fe48592
+        uses: dreaded_x/workflows/.gitea/workflows/docker-kubernetes.yaml@ef78704b98c72e4a6b8340f9bff7b085a7bdd95c
         secrets: inherit
         with:
-            upload_manifests: false
+            push_manifests: false
 
     deploy:
         name: Deploy container
@@ -26,6 +26,10 @@ jobs:
                   docker stop automation_rs || true
                   docker rm automation_rs || true
 
+            - name: Login to registry
+              run: |
+                  docker login git.huizinga.dev -u ${{ gitea.actor }} -p ${{ secrets.REGISTRY_TOKEN }} \
+
             - name: Create container
               run: |
                   docker create \
@@ -37,7 +41,7 @@ jobs:
                     -e AUTOMATION__SECRETS__MQTT_PASSWORD=${{ secrets.MQTT_PASSWORD }} \
                     -e AUTOMATION__SECRETS__HUE_TOKEN=${{ secrets.HUE_TOKEN }} \
                     -e AUTOMATION__SECRETS__NTFY_TOPIC=${{ secrets.NTFY_TOPIC }} \
-                    git.huizinga.dev/dreaded_x/automation_rs@${{ needs.build.outputs.digest }}
+                    $(echo ${{ toJSON(needs.build.outputs.images) }} | jq .automation -r)
 
                   docker network connect web automation_rs
 

Cargo.toml

@@ -16,28 +16,28 @@ members = [
 
 [workspace.dependencies]
 air_filter_types = { git = "https://git.huizinga.dev/Dreaded_X/airfilter", tag = "v0.4.4" }
-anyhow = "1.0.99"
+anyhow = "1.0.102"
 async-trait = "0.1.89"
 automation_cast = { path = "./automation_cast" }
 automation_devices = { path = "./automation_devices" }
 automation_lib = { path = "./automation_lib" }
 automation_macro = { path = "./automation_macro" }
-axum = "0.8.4"
+axum = "0.8.9"
-bytes = "1.10.1"
+bytes = "1.11.1"
 dyn-clone = "1.0.20"
 eui48 = { version = "1.1.0", features = [
   "disp_hexstring",
   "serde",
 ], default-features = false }
-futures = "0.3.31"
+futures = "0.3.32"
 google_home = { path = "./google_home/google_home" }
 google_home_macro = { path = "./google_home/google_home_macro" }
-hostname = "0.4.1"
+hostname = "0.4.2"
-inventory = "0.3.21"
+inventory = "0.3.24"
 itertools = "0.14.0"
 json_value_merge = "2.0.1"
 lua_typed = { git = "https://git.huizinga.dev/Dreaded_X/lua_typed" }
-mlua = { version = "0.11.3", features = [
+mlua = { version = "0.11.6", features = [
   "lua54",
   "vendored",
   "macros",
@@ -45,23 +45,23 @@ mlua = { version = "0.11.3", features = [
   "async",
   "send",
 ] }
-proc-macro2 = "1.0.101"
+proc-macro2 = "1.0.106"
-quote = "1.0.40"
+quote = "1.0.45"
-reqwest = { version = "0.12.23", features = [
+reqwest = { version = "0.13.3", features = [
   "json",
-  "rustls-tls",
+  "rustls",
 ], default-features = false } # Use rustls, since the other packages also use rustls
-rumqttc = "0.24.0"
+rumqttc = "0.25.1"
-serde = { version = "1.0.219", features = ["derive"] }
+serde = { version = "1.0.228", features = ["derive"] }
-serde_json = "1.0.143"
+serde_json = "1.0.149"
 serde_repr = "0.1.20"
-syn = { version = "2.0.106" }
+syn = { version = "2.0.117" }
-thiserror = "2.0.16"
+thiserror = "2.0.18"
 tokio = { version = "1", features = ["rt-multi-thread"] }
-tokio-cron-scheduler = "0.15.0"
+tokio-cron-scheduler = "0.15.1"
-tracing = "0.1.41"
+tracing = "0.1.44"
-tracing-subscriber = "0.3.20"
+tracing-subscriber = "0.3.23"
-wakey = "0.3.0"
+wakey = "0.4.1"
 
 [dependencies]
 anyhow = { workspace = true }
@@ -70,7 +70,7 @@ automation_devices = { workspace = true }
 automation_lib = { workspace = true }
 automation_macro = { path = "./automation_macro" }
 axum = { workspace = true }
-config = { version = "0.15.15", default-features = false, features = [
+config = { version = "0.15.22", default-features = false, features = [
   "async",
   "toml",
 ] }

Dockerfile

@@ -1,8 +1,9 @@
-FROM rust:1.89 AS base
+FROM rust:1.95 AS base
 ENV CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse
 RUN cargo install cargo-chef --locked --version 0.1.71 && \
     cargo install cargo-auditable --locked --version 0.6.6
 WORKDIR /app
+RUN rustup toolchain install
 
 FROM base AS planner
 COPY . .
@@ -19,7 +20,9 @@ ARG RELEASE_VERSION
 ENV RELEASE_VERSION=${RELEASE_VERSION}
 RUN cargo auditable build --release
 
-FROM gcr.io/distroless/cc-debian12:nonroot AS runtime
+FROM gcr.io/distroless/cc-debian13:nonroot AS runtime
 COPY --from=builder /app/target/release/automation /app/automation
+ENV AUTOMATION__ENTRYPOINT=/app/config/config.lua
+ENV LUA_PATH="/app/?.lua;;"
 COPY ./config /app/config
 CMD [ "/app/automation" ]

README.md

@@ -4,9 +4,9 @@ Custom home automation solution with Google Home integration and lua scripting.
 
 ## Development
 
-This repository uses [pre-commit](https://pre-commit.com) to make sure everything is ready to go when committing.
+This repository uses [prek](https://prek.j178.dev/) to make sure everything is ready to go when committing.
 Install the pre-commit hooks by running the following command:
 
 ```bash
-pre-commit install
+prek install
 ```

automation_devices/src/hue_group.rs

@@ -2,6 +2,7 @@ use std::net::SocketAddr;
 
 use anyhow::Result;
 use async_trait::async_trait;
+use automation_lib::lua::traits::PartialUserData;
 use automation_macro::{Device, LuaDeviceConfig};
 use google_home::errors::ErrorCode;
 use google_home::traits::OnOff;
@@ -25,6 +26,7 @@ crate::register_type!(Config);
 
 #[derive(Debug, Clone, Device)]
 #[device(traits(OnOff))]
+#[device(extra_user_data = AllOn)]
 pub struct HueGroup {
     config: Config,
 }
@@ -122,6 +124,47 @@ impl OnOff for HueGroup {
     }
 }
 
+struct AllOn;
+impl PartialUserData<HueGroup> for AllOn {
+    fn add_methods<M: mlua::UserDataMethods<HueGroup>>(methods: &mut M) {
+        methods.add_async_method("all_on", async |_lua, this, ()| {
+            let res = reqwest::Client::new()
+                .get(this.url_get_state())
+                .send()
+                .await;
+
+            match res {
+                Ok(res) => {
+                    let status = res.status();
+                    if !status.is_success() {
+                        warn!(id = this.get_id(), "Status code is not success: {status}");
+                    }
+
+                    let on = match res.json::<message::Info>().await {
+                        Ok(info) => info.all_on(),
+                        Err(err) => {
+                            error!(id = this.get_id(), "Failed to parse message: {err}");
+                            return Ok(false);
+                        }
+                    };
+
+                    return Ok(on);
+                }
+                Err(err) => error!(id = this.get_id(), "Error: {err}"),
+            }
+
+            Ok(false)
+        });
+    }
+
+    fn definitions() -> Option<String> {
+        Some(format!(
+            "---@async\n---@return boolean\nfunction {}:all_on() end\n",
+            <HueGroup as Typed>::type_name(),
+        ))
+    }
+}
+
 mod message {
     use serde::{Deserialize, Serialize};
 
@@ -164,5 +207,9 @@ mod message {
         pub fn any_on(&self) -> bool {
             self.state.any_on
         }
+
+        pub fn all_on(&self) -> bool {
+            self.state.all_on
+        }
     }
 }

automation_devices/src/hue_switch.rs

@@ -122,15 +122,11 @@ impl OnMqtt for HueSwitch {
                     Action::LeftHold => self.config.left_hold_callback.call(self.clone()).await,
                     Action::RightHold => self.config.right_hold_callback.call(self.clone()).await,
                     // If there is no hold action, the switch will act like a normal release
-                    Action::RightHoldRelease => {
+                    Action::RightHoldRelease if self.config.right_hold_callback.is_empty() => {
-                        if self.config.right_hold_callback.is_empty() {
+                        self.config.right_callback.call(self.clone()).await
-                            self.config.right_callback.call(self.clone()).await
-                        }
                     }
-                    Action::LeftHoldRelease => {
+                    Action::LeftHoldRelease if self.config.left_hold_callback.is_empty() => {
-                        if self.config.left_hold_callback.is_empty() {
+                        self.config.left_callback.call(self.clone()).await
-                            self.config.left_callback.call(self.clone()).await
-                        }
                     }
                     _ => {}
                 }

automation_macro/src/lib.rs

@@ -1,4 +1,3 @@
-#![feature(iter_intersperse)]
 #![feature(iterator_try_collect)]
 mod device;
 mod lua_device_config;

config/rooms/bedroom.lua

@@ -25,6 +25,13 @@ function module.setup(mqtt_client)
 		group_id = 3,
 		scene_id = "60tfTyR168v2csz",
 	})
+	local wardrobe_light = devices.HueGroup.new({
+		identifier = "bedroom_lights_wardrobe",
+		ip = hue_bridge.ip,
+		login = hue_bridge.token,
+		group_id = 3,
+		scene_id = "1IDvpsN2YLZsDV95",
+	})
 
 	air_filter = devices.AirFilter.new({
 		name = "Air Filter",
@@ -32,13 +39,36 @@ function module.setup(mqtt_client)
 		url = "http://10.0.0.103",
 	})
 
+	local wardrobe_door = devices.ContactSensor.new({
+		name = "Wardrobe Door",
+		room = "Bedroom",
+		sensor_type = "Door",
+		topic = helper.mqtt_z2m("bedroom/wardrobe_door"),
+		client = mqtt_client,
+		callback = function(_, open)
+			-- Technically this has an edge case where if one of the spots is
+			-- on, but that is not something I ever do
+			if not lights:all_on() then
+				wardrobe_light:set_on(open)
+			end
+		end,
+		battery_callback = battery.callback,
+	})
+
 	local switch = devices.HueSwitch.new({
 		name = "Switch",
 		room = "Bedroom",
 		client = mqtt_client,
 		topic = helper.mqtt_z2m("bedroom/switch"),
 		left_callback = function()
-			lights:set_on(not lights:on())
+			local on = not lights:all_on()
+			lights:set_on(on)
+			-- This is a bit janky as the light will start to dim before turning
+			-- back on, however this is really and edge case that probably won't
+			-- happen often, so for now it's fine
+			if not on and wardrobe_door:open_percent() == 100 then
+				wardrobe_light:set_on(true)
+			end
 		end,
 		left_hold_callback = function()
 			lights_relax:set_on(true)
@@ -61,6 +91,7 @@ function module.setup(mqtt_client)
 			lights,
 			lights_relax,
 			air_filter,
+			wardrobe_door,
 			switch,
 			window,
 		},

config/rooms/guest_bedroom.lua

@@ -25,10 +25,18 @@ function module.setup(mqtt_client)
 	})
 	windows.add(window)
 
+	local printer = devices.OutletOnOff.new({
+		name = "3D Printer",
+		room = "Guest Room",
+		topic = helper.mqtt_z2m("guest/printer"),
+		client = mqtt_client,
+	})
+
 	--- @type Module
 	return {
 		light,
 		window,
+		printer,
 	}
 end
 

config/rooms/hallway_bottom.lua

@@ -59,26 +59,21 @@ function module.setup(mqtt_client)
 	})
 	hallway_automation.set_trash(trash)
 
-	---@param duration number
+	local timeout = utils.Timeout.new()
-	---@return fun(_, open: boolean)
+	local function frontdoor_presence(_, open)
-	local function frontdoor_presence(duration)
+		if open then
-		local timeout = utils.Timeout.new()
+			timeout:cancel()
 
-		return function(_, open)
+			if not presence.overall_presence() then
-			if open then
+				mqtt_client:send_message(helper.mqtt_automation("presence/contact/frontdoor"), {
-				timeout:cancel()
+					state = true,
-
+					updated = utils.get_epoch(),
-				if presence.overall_presence() then
+				})
-					mqtt_client:send_message(helper.mqtt_automation("presence/contact/frontdoor"), {
-						state = true,
-						updated = utils.get_epoch(),
-					})
-				end
-			else
-				timeout:start(duration, function()
-					mqtt_client:send_message(helper.mqtt_automation("presence/contact/frontdoor"), nil)
-				end)
 			end
+		else
+			timeout:start(debug.debug_mode and 10 or 15 * 60, function()
+				mqtt_client:send_message(helper.mqtt_automation("presence/contact/frontdoor"), nil)
+			end)
 		end
 	end
 
@@ -89,7 +84,7 @@ function module.setup(mqtt_client)
 		topic = helper.mqtt_z2m("hallway/frontdoor"),
 		client = mqtt_client,
 		callback = {
-			frontdoor_presence(debug.debug_mode and 10 or 15 * 60),
+			frontdoor_presence,
 			hallway_automation.door_callback,
 		},
 		battery_callback = battery.callback,

definitions/automation:devices.lua

@@ -116,6 +116,9 @@ devices.HueGroup = {}
 ---@param config HueGroupConfig
 ---@return HueGroup
 function devices.HueGroup.new(config) end
+---@async
+---@return boolean
+function HueGroup:all_on() end
 
 ---@class HueGroupConfig
 ---@field identifier string

docker-bake.hcl

@@ -0,0 +1,18 @@
+variable "TAG_BASE" {}
+variable "RELEASE_VERSION" {}
+
+group "default" {
+	targets = ["automation"]
+}
+
+target "docker-metadata-action" {}
+
+target "automation" {
+	inherits = ["docker-metadata-action"]
+	context = "./"
+	dockerfile = "Dockerfile"
+	tags = [for tag in target.docker-metadata-action.tags : "${TAG_BASE}:${tag}"]
+	args = {
+		RELEASE_VERSION="${RELEASE_VERSION}"
+	}
+}

rust-toolchain.toml

@@ -1,4 +1,4 @@
 [toolchain]
-channel = "nightly-2025-08-20"
+channel = "nightly-2026-05-12"
 components = ["rustfmt", "clippy", "rust-analyzer"]
 profile = "minimal"

src/lib.rs

@@ -1,5 +1,3 @@
-#![feature(if_let_guard)]
-
 pub mod config;
 pub mod schedule;
 pub mod secret;