version bump

clippy
implemented 'enabled'
2026-04-04 04:25:04 +02:00 · 2026-04-04 04:24:35 +02:00 · 2026-04-04 04:24:09 +02:00 · 2026-04-04 00:18:50 +02:00 · 2026-04-04 00:18:22 +02:00 · 2026-04-03 23:45:58 +02:00
33 changed files with 3582 additions and 967 deletions
@@ -73,12 +73,155 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"

+[[package]]
+name = "async-broadcast"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "435a87a52755b8f27fcf321ac4f04b2802e337c8c4872923137471ec39c37532"
+dependencies = [
+ "event-listener",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-channel"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c96bf972d85afc50bf5ab8fe2d54d1586b4e0b46c97c50a0c9e71e2f7bcd812a"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-io"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc"
+dependencies = [
+ "autocfg",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite",
+ "parking",
+ "polling",
+ "rustix",
+ "slab",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311"
+dependencies = [
+ "event-listener",
+ "event-listener-strategy",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-process"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc50921ec0055cdd8a16de48773bfeec5c972598674347252c0399676be7da75"
+dependencies = [
+ "async-channel",
+ "async-io",
+ "async-lock",
+ "async-signal",
+ "async-task",
+ "blocking",
+ "cfg-if",
+ "event-listener",
+ "futures-lite",
+ "rustix",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "async-signal"
+version = "0.2.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43c070bbf59cd3570b6b2dd54cd772527c7c3620fce8be898406dd3ed6adc64c"
+dependencies = [
+ "async-io",
+ "async-lock",
+ "atomic-waker",
+ "cfg-if",
+ "futures-core",
+ "futures-io",
+ "rustix",
+ "signal-hook-registry",
+ "slab",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "async-task"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+
+[[package]]
+name = "async-trait"
+version = "0.1.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
 [[package]]
 name = "autocfg"
 version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"

+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
 [[package]]
 name = "bitflags"
 version = "2.11.0"
@@ -94,6 +237,19 @@ dependencies = [
 "objc2",
 ]

+[[package]]
+name = "blocking"
+version = "1.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21"
+dependencies = [
+ "async-channel",
+ "async-task",
+ "futures-io",
+ "futures-lite",
+ "piper",
+]
+
 [[package]]
 name = "bluer"
 version = "0.17.4"
@@ -193,6 +349,21 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570"

+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
 [[package]]
 name = "ctrlc"
 version = "3.5.2"
@@ -300,7 +471,7 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
 dependencies = [
- "bitflags",
+ "bitflags 2.11.0",
 "block2",
 "libc",
 "objc2",
@@ -323,6 +494,33 @@ version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"

+[[package]]
+name = "endi"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66b7e2430c6dff6a955451e2cfc438f09cea1965a9d6f87f7e3b90decc014099"
+
+[[package]]
+name = "enumflags2"
+version = "0.7.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1027f7680c853e056ebcec683615fb6fbbc07dbaa13b4d5d9442b146ded4ecef"
+dependencies = [
+ "enumflags2_derive",
+ "serde",
+]
+
+[[package]]
+name = "enumflags2_derive"
+version = "0.7.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "equivalent"
 version = "1.0.2"
@@ -339,6 +537,27 @@ dependencies = [
 "windows-sys 0.61.2",
 ]

+[[package]]
+name = "event-listener"
+version = "5.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
+dependencies = [
+ "event-listener",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "fastrand"
 version = "2.3.0"
@@ -353,16 +572,18 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"

 [[package]]
 name = "fluxo-rs"
-version = "0.3.1"
+version = "0.4.2"
 dependencies = [
 "anyhow",
 "bluer",
 "clap",
 "ctrlc",
 "futures",
+ "libc",
 "libpulse-binding",
 "maestro",
 "nix 0.31.2",
+ "notify",
 "regex",
 "serde",
 "serde_json",
@@ -374,6 +595,7 @@ dependencies = [
 "toml",
 "tracing",
 "tracing-subscriber",
+ "zbus",
 ]

 [[package]]
@@ -388,6 +610,15 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"

+[[package]]
+name = "fsevent-sys"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "futures"
 version = "0.3.32"
@@ -436,6 +667,19 @@ version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718"

+[[package]]
+name = "futures-lite"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "futures-macro"
 version = "0.3.32"
@@ -510,6 +754,12 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"

+[[package]]
+name = "hermit-abi"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
+
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -530,9 +780,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"

 [[package]]
 name = "indexmap"
-version = "2.13.0"
+version = "2.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7714e70437a7dc3ac8eb7e6f8df75fd8eb422675fc7678aff7364301092b1017"
+checksum = "45a8a2b9cb3e0b0c1803dbb0758ffac5de2f425b23c28f518faabd9d805342ff"
 dependencies = [
 "equivalent",
 "hashbrown 0.16.1",
@@ -540,6 +790,26 @@ dependencies = [
 "serde_core",
 ]

+[[package]]
+name = "inotify"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd5b3eaf1a28b758ac0faa5a4254e8ab2705605496f1b1f3fbbc3988ad73d199"
+dependencies = [
+ "bitflags 2.11.0",
+ "inotify-sys",
+ "libc",
+]
+
+[[package]]
+name = "inotify-sys"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.2"
@@ -571,6 +841,26 @@ dependencies = [
 "wasm-bindgen",
 ]

+[[package]]
+name = "kqueue"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a"
+dependencies = [
+ "kqueue-sys",
+ "libc",
+]
+
+[[package]]
+name = "kqueue-sys"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
+dependencies = [
+ "bitflags 1.3.2",
+ "libc",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -604,7 +894,7 @@ version = "2.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "909eb3049e16e373680fe65afe6e2a722ace06b671250cc4849557bc57d6a397"
 dependencies = [
- "bitflags",
+ "bitflags 2.11.0",
 "libc",
 "libpulse-sys",
 "num-derive",
@@ -691,6 +981,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1"
 dependencies = [
 "libc",
+ "log",
 "wasi",
 "windows-sys 0.61.2",
 ]
@@ -707,7 +998,7 @@ version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags",
+ "bitflags 2.11.0",
 "cfg-if",
 "cfg_aliases",
 "libc",
@@ -719,13 +1010,40 @@ version = "0.31.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d6d0705320c1e6ba1d912b5e37cf18071b6c2e9b7fa8215a1e8a7651966f5d3"
 dependencies = [
- "bitflags",
+ "bitflags 2.11.0",
 "cfg-if",
 "cfg_aliases",
 "libc",
 "memoffset",
 ]

+[[package]]
+name = "notify"
+version = "8.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3"
+dependencies = [
+ "bitflags 2.11.0",
+ "fsevent-sys",
+ "inotify",
+ "kqueue",
+ "libc",
+ "log",
+ "mio",
+ "notify-types",
+ "walkdir",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "notify-types"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42b8cfee0e339a0337359f3c88165702ac6e600dc01c0cc9579a92d62b08477a"
+dependencies = [
+ "bitflags 2.11.0",
+]
+
 [[package]]
 name = "ntapi"
 version = "0.4.3"
@@ -801,7 +1119,7 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 dependencies = [
- "bitflags",
+ "bitflags 2.11.0",
 ]

 [[package]]
@@ -832,6 +1150,22 @@ version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"

+[[package]]
+name = "ordered-stream"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aa2b01e1d916879f73a53d01d1d6cee68adbb31d6d9177a8cfce093cced1d50"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "parking"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+
 [[package]]
 name = "petgraph"
 version = "0.8.3"
@@ -869,12 +1203,37 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"

+[[package]]
+name = "piper"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c835479a4443ded371d6c535cbfd8d31ad92c5d23ae9770a61bc155e4992a3c1"
+dependencies = [
+ "atomic-waker",
+ "fastrand",
+ "futures-io",
+]
+
 [[package]]
 name = "pkg-config"
 version = "0.3.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"

+[[package]]
+name = "polling"
+version = "3.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi",
+ "pin-project-lite",
+ "rustix",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "prettyplease"
 version = "0.2.37"
@@ -1004,7 +1363,7 @@ version = "1.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
 dependencies = [
- "bitflags",
+ "bitflags 2.11.0",
 "errno",
 "libc",
 "linux-raw-sys",
@@ -1017,6 +1376,15 @@ version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"

+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "semver"
 version = "1.0.27"
@@ -1066,6 +1434,17 @@ dependencies = [
 "zmij",
 ]

+[[package]]
+name = "serde_repr"
+version = "0.1.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "serde_spanned"
 version = "1.1.1"
@@ -1270,14 +1649,15 @@ dependencies = [
 "futures-core",
 "futures-sink",
 "pin-project-lite",
+ "slab",
 "tokio",
 ]

 [[package]]
 name = "toml"
-version = "1.1.1+spec-1.1.0"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "994b95d9e7bae62b34bab0e2a4510b801fa466066a6a8b2b57361fa1eba068ee"
+checksum = "81f3d15e84cbcd896376e6730314d59fb5a87f31e4b038454184435cd57defee"
 dependencies = [
 "indexmap",
 "serde_core",
@@ -1285,7 +1665,7 @@ dependencies = [
 "toml_datetime",
 "toml_parser",
 "toml_writer",
- "winnow",
+ "winnow 1.0.1",
 ]

 [[package]]
@@ -1299,23 +1679,23 @@ dependencies = [

 [[package]]
 name = "toml_edit"
-version = "0.25.8+spec-1.1.0"
+version = "0.25.10+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16bff38f1d86c47f9ff0647e6838d7bb362522bdf44006c7068c2b1e606f1f3c"
+checksum = "a82418ca169e235e6c399a84e395ab6debeb3bc90edc959bf0f48647c6a32d1b"
 dependencies = [
 "indexmap",
 "toml_datetime",
 "toml_parser",
- "winnow",
+ "winnow 1.0.1",
 ]

 [[package]]
 name = "toml_parser"
-version = "1.1.1+spec-1.1.0"
+version = "1.1.2+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39ca317ebc49f06bd748bfba29533eac9485569dc9bf80b849024b025e814fb9"
+checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
 dependencies = [
- "winnow",
+ "winnow 1.0.1",
 ]

 [[package]]
@@ -1385,6 +1765,17 @@ dependencies = [
 "tracing-log",
 ]

+[[package]]
+name = "uds_windows"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e"
+dependencies = [
+ "memoffset",
+ "tempfile",
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.24"
@@ -1411,6 +1802,7 @@ checksum = "5ac8b6f42ead25368cf5b098aeb3dc8a1a2c05a3eee8a9a1a68c640edbfc79d9"
 dependencies = [
 "getrandom",
 "js-sys",
+ "serde_core",
 "wasm-bindgen",
 ]

@@ -1420,6 +1812,16 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"

+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
 [[package]]
 name = "wasi"
 version = "0.11.1+wasi-snapshot-preview1"
@@ -1517,7 +1919,7 @@ version = "0.244.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
 dependencies = [
- "bitflags",
+ "bitflags 2.11.0",
 "hashbrown 0.15.5",
 "indexmap",
 "semver",
@@ -1539,6 +1941,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"

+[[package]]
+name = "winapi-util"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
@@ -1652,7 +2063,16 @@ version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.5",
 ]

 [[package]]
@@ -1670,14 +2090,31 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm 0.52.6",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
 ]

 [[package]]
@@ -1695,48 +2132,105 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"

+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"

+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"

+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
+
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"

+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"

+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"

+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"

+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
+
+[[package]]
+name = "winnow"
+version = "0.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "winnow"
 version = "1.0.1"
@@ -1804,7 +2298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
 dependencies = [
 "anyhow",
- "bitflags",
+ "bitflags 2.11.0",
 "indexmap",
 "log",
 "serde",
@@ -1834,8 +2328,109 @@ dependencies = [
 "wasmparser",
 ]

+[[package]]
+name = "zbus"
+version = "5.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca82f95dbd3943a40a53cfded6c2d0a2ca26192011846a1810c4256ef92c60bc"
+dependencies = [
+ "async-broadcast",
+ "async-executor",
+ "async-io",
+ "async-lock",
+ "async-process",
+ "async-recursion",
+ "async-task",
+ "async-trait",
+ "blocking",
+ "enumflags2",
+ "event-listener",
+ "futures-core",
+ "futures-lite",
+ "hex",
+ "libc",
+ "ordered-stream",
+ "rustix",
+ "serde",
+ "serde_repr",
+ "tracing",
+ "uds_windows",
+ "uuid",
+ "windows-sys 0.61.2",
+ "winnow 0.7.15",
+ "zbus_macros",
+ "zbus_names",
+ "zvariant",
+]
+
+[[package]]
+name = "zbus_macros"
+version = "5.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "897e79616e84aac4b2c46e9132a4f63b93105d54fe8c0e8f6bffc21fa8d49222"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "zbus_names",
+ "zvariant",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zbus_names"
+version = "4.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffd8af6d5b78619bab301ff3c560a5bd22426150253db278f164d6cf3b72c50f"
+dependencies = [
+ "serde",
+ "winnow 0.7.15",
+ "zvariant",
+]
+
 [[package]]
 name = "zmij"
 version = "1.0.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa"
+
+[[package]]
+name = "zvariant"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5708299b21903bbe348e94729f22c49c55d04720a004aa350f1f9c122fd2540b"
+dependencies = [
+ "endi",
+ "enumflags2",
+ "serde",
+ "winnow 0.7.15",
+ "zvariant_derive",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zvariant_derive"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b59b012ebe9c46656f9cc08d8da8b4c726510aef12559da3e5f1bf72780752c"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "zvariant_utils",
+]
+
+[[package]]
+name = "zvariant_utils"
+version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f75c23a64ef8f40f13a6989991e643554d9bef1d682a281160cf0c1bc389c5e9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde",
+ "syn",
+ "winnow 0.7.15",
+]
@@ -1,28 +1,40 @@
 [package]
 name = "fluxo-rs"
-version = "0.3.1"
+version = "0.4.2"
 edition = "2024"

+[features]
+default = ["mod-audio", "mod-bt", "mod-network", "mod-hardware", "mod-dbus"]
+mod-audio = ["dep:libpulse-binding"]
+mod-bt = ["dep:bluer", "dep:maestro"]
+mod-network = ["dep:nix"]
+mod-hardware = []
+mod-dbus = ["dep:zbus", "dep:futures"]
+
 [dependencies]
 anyhow = "1.0.102"
 clap = { version = "4.6.0", features = ["derive"] }
 ctrlc = "3"
+libc = "0.2"
 regex = "1.12"
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.149"
 sysinfo = "0.38.4"
 thiserror = "2.0"
-toml = "1.1.1"
+toml = "1.1.2"
 tracing = "0.1.44"
 tracing-subscriber = { version = "0.3.23", features = ["env-filter"] }
-maestro = { git = "https://github.com/qzed/pbpctrl", package = "maestro" }
-bluer = { version = "0.17", features = ["bluetoothd", "rfcomm", "id"] }
-tokio = { version = "1", features = ["rt", "rt-multi-thread", "sync", "time", "macros", "signal"] }
-tokio-util = { version = "0.7", features = ["codec"] }
-futures = "0.3"
-libpulse-binding = "2.30"
-nix = { version = "0.31", features = ["net"] }
+tokio = { version = "1", features = ["rt", "rt-multi-thread", "sync", "time", "macros", "signal", "process", "io-util", "net"] }
+tokio-util = { version = "0.7", features = ["codec", "time"] }
+notify = "8.2.0"
+
+# Optional module dependencies
+maestro = { git = "https://github.com/qzed/pbpctrl", package = "maestro", optional = true }
+bluer = { version = "0.17", features = ["bluetoothd", "rfcomm", "id"], optional = true }
+futures = { version = "0.3", optional = true }
+libpulse-binding = { version = "2.30", optional = true }
+nix = { version = "0.31", features = ["net"], optional = true }
+zbus = { version = "5", optional = true }

 [dev-dependencies]
-
 tempfile = "3"
@@ -1,18 +1,16 @@
 # fluxo-rs

-fluxo-rs is a high-performance system metrics daemon and client designed specifically for Waybar. It replaces standard shell scripts with a compiled Rust binary that collects data via a background polling loop and serves it over a Unix socket.
+`fluxo-rs` is a high-performance system metrics daemon and client designed specifically for Waybar. It entirely replaces standard shell scripts with a compiled Rust binary that collects data via a background polling loop and serves it over a Unix socket. 
+
+With its **100% Native, Content-Based Event-Driven Architecture**, it consumes effectively 0% CPU while idle and signals Waybar to redraw *only* when the rendered UI text or icons physically change.

 ## Key Features

- **Asynchronous Architecture**: Built on **Tokio**, the daemon handles concurrent IPC requests and background tasks with zero latency and minimal CPU overhead.
- **Native Library Integrations**: 
-    - **Audio**: Direct `libpulse` integration for event-driven, instant volume and device updates.
-    - **Bluetooth**: Native `bluer` integration for robust device monitoring.
-    - **Pixel Buds Pro**: Custom native RPC implementation for real-time battery and ANC control.
-    - **Network**: Native `nix` and `/proc` inspection for high-speed interface monitoring.
-    - **Hyprland**: Direct IPC Unix socket communication for gamemode and animation status.
- **Circuit Breaker (Failsafe)**: Automatically detects failing modules and enters a "Cool down" state to prevent resource waste and log spam.
- **Multi-threaded Polling**: Decoupled subsystem threads ensure that a hang in one system (e.g., a slow GPU probe) never freezes your entire bar.
+- **100% Native Architecture**: Zero shell-outs or subprocesses. Uses `bluer` for Bluetooth, `libpulse-binding` for audio, `zbus` for MPRIS/DND, and `notify` for backlight.
+- **Content-Based Event Signaling**: `fluxo-rs` evaluates your custom configuration formats internally. It only sends a `SIGRTMIN+X` signal to Waybar if the resulting string or CSS class has actually changed, eliminating pointless re-renders from raw polling fluctuations.
+- **Zero-Latency Interactions**: Direct library bindings mean that when you change your volume or connect a Bluetooth device via the CLI, the daemon updates instantly.
+- **Circuit Breaker (Failsafe)**: Automatically detects failing modules and enters a "Cool down" state, preventing resource waste and log spam. Fallback caching keeps your bar looking clean even during brief failures.
+- **Multi-threaded Polling**: Decoupled Tokio subsystem threads ensure that a hang in one system (e.g., a slow GPU probe) never freezes your Waybar.

 ## Modules

@@ -24,37 +22,47 @@ fluxo-rs is a high-performance system metrics daemon and client designed specifi
 | `sys` | System load and uptime | `{uptime}`, `{load1}`, `{load5}`, `{load15}`, `{procs}` |
 | `disk` | Disk usage | `{mount}`, `{used}`, `{total}` |
 | `pool` | Btrfs aggregate storage | `{used}`, `{total}` |
+| `gpu` | GPU usage & thermals | `{usage}`, `{vram_used}`, `{vram_total}`, `{temp}` |
 | `vol` | Audio output (sink) | `{name}`, `{volume}`, `{icon}` |
 | `mic` | Audio input (source) | `{name}`, `{volume}`, `{icon}` |
 | `bt` | Bluetooth status & plugins | `{alias}`, `{mac}`, `{left}`, `{right}`, `{anc}` |
 | `power` | Battery and AC status | `{percentage}`, `{icon}` |
-| `game` | Hyprland status | active/inactive icons |
+| `game` | Hyprland Gamemode status | active/inactive strings |
+| `mpris` | Media Player status | `{artist}`, `{title}`, `{album}`, `{status_icon}` |
+| `backlight` | Display Brightness | `{percentage}`, `{icon}` |
+| `kbd` | Keyboard Layout | `{layout}` |
+| `dnd` | Do Not Disturb (SwayNC) | active/inactive strings |

 ## Setup

 1. **Build**: `cargo build --release`
-2. **Configure**: Create `~/.config/fluxo/config.toml` (see `example.config.toml`).
-3. **Daemon**: Start `fluxo-rs daemon`. It's recommended to run this as a systemd user service.
+2. **Configure**: Create `~/.config/fluxo/config.toml` (see `example.config.toml`). Ensure you map your `[signals]`.
+3. **Daemon**: Start `fluxo-rs daemon`. It is highly recommended to run this as a systemd user service.

 ## Waybar Configuration

-To achieve zero-latency updates, use **Waybar Signals**:
+To achieve zero-latency updates and zero-polling CPU usage, set `interval: 0` on your modules and rely entirely on **Waybar Signals** mapped in your `config.toml`:

 ```jsonc
-"custom/audio": {
-    "exec": "fluxo vol",
+"custom/volume": {
+    "exec": "fluxo-rs vol",
    "return-type": "json",
-    "interval": 5,
-    "signal": 8,
-    "on-click": "fluxo audio cycle sink && pkill -RTMIN+8 waybar"
+    "interval": 0,
+    "signal": 8, // Must match the value in config.toml [signals]
+    "on-click": "fluxo-rs vol mute",
+    "on-scroll-up": "fluxo-rs vol up 1",
+    "on-scroll-down": "fluxo-rs vol down 1",
+    "on-click-right": "fluxo-rs vol cycle"
 },
-"custom/bluetooth": {
-    "exec": "fluxo bt",
+"custom/bluetooth-audio": {
+    "format": "{}",
    "return-type": "json",
-    "interval": 5,
+    "exec": "fluxo-rs bt",
+    "on-click": "fluxo-rs bt menu",
+    "on-click-right": "fluxo-rs bt cycle_mode",
    "signal": 9,
-    "on-click": "fluxo bt menu && pkill -RTMIN+9 waybar",
-    "on-click-right": "fluxo bt cycle_mode && pkill -RTMIN+9 waybar"
+    "interval": 0,
+    "tooltip": true
 }
 ```

@@ -1,46 +1,112 @@
 # Fluxo configuration example
+# Place this at ~/.config/fluxo/config.toml
+
+# Note: All tokens support standard alignment, padding, and precision specifiers dynamically.
+# For example, you can change {rx:>5.2} to {rx:<8.1} or {used} to {used:^4.0} directly here.

 [general]
-menu_command = "fuzzel --dmenu --prompt '{prompt}'"
+# command used for interactive menus (e.g., bluetooth device selection)
+# $FLUXO_PROMPT is securely injected to prevent shell escaping issues
+menu_command = "fuzzel --dmenu --prompt \"$FLUXO_PROMPT\""
+# For Wofi use: menu_command = "wofi --show dmenu --prompt \"$FLUXO_PROMPT\""
+
+# Map modules to specific Waybar signals for zero-latency, event-driven UI updates.
+# These MUST match the `signal` configuration in your waybar config.jsonc
+[signals]
+network = 1
+cpu = 2
+memory = 3
+gpu = 4
+sys = 5
+disk = 6
+game = 7
+audio = 8
+bt = 9
+power = 10
+keyboard = 11
+mpris = 12
+backlight = 13
+dnd = 14

 [network]
-format = "{interface} ({ip}):  {rx:>5.2} MB/s   {tx:>5.2} MB/s"
+# enabled = false  # set to false to disable this module at runtime
+# tokens: {interface}, {ip}, {rx}, {tx}
+format = "{interface} ({ip}):  {rx:^4.1} MB/s   {tx:^4.1} MB/s"

 [cpu]
-format = "CPU: {usage:>4.1}% {temp:>4.1}C"
+# enabled = false  # set to false to disable this module at runtime
+# tokens: {usage}, {temp}, {model}
+format = "CPU: {usage:^4.1}% {temp:^4.1}C"

 [memory]
-format = "{used:>5.2}/{total:>5.2}GB"
+# enabled = false  # set to false to disable this module at runtime
+# tokens: {used}, {total}
+format = "MEM: {used:^4.1}/{total:^4.1}GB"

 [gpu]
+# enabled = false  # set to false to disable this module at runtime
+# tokens: {usage}, {vram_used}, {vram_total}, {temp}
 format_amd = "AMD: {usage:>3.0}% {vram_used:>4.1}/{vram_total:>4.1}GB {temp:>4.1}C"
 format_intel = "iGPU: {usage:>3.0}%"
 format_nvidia = "NV: {usage:>3.0}% {vram_used:>4.1}/{vram_total:>4.1}GB {temp:>4.1}C"

 [sys]
-format = "UP: {uptime} | LOAD: {load1:>4.2} {load5:>4.2} {load15:>4.2}"
+# enabled = false  # set to false to disable this module at runtime
+# tokens: {uptime}, {load1}, {load5}, {load15}, {procs}
+format = "UP: {uptime} LOAD: {load1:^3.1} "

 [disk]
-format = "{mount} {used:>5.1}/{total:>5.1}G"
+# enabled = false  # set to false to disable this module at runtime
+# tokens: {mount}, {used}, {total}
+format = "{mount} {used:^3.0}/{total:^3.0}G"

 [pool]
+# enabled = false  # set to false to disable this module at runtime
+# tokens: {used}, {total}
 format = "{used:>4.0}G / {total:>4.0}G"

 [power]
+# enabled = false  # set to false to disable this module at runtime
+# tokens: {percentage}, {icon}
 format = "{percentage:>3}%  {icon}"

-[bt]
-format_connected = "{alias} 󰂰"
-format_plugin = "{alias} [{left}|{right}] {anc} 󰂰"
-format_disconnected = "󰂯"
-format_disabled = "󰂲 Off"
-
 [audio]
+# enabled = false  # set to false to disable this module at runtime
+# tokens: {name}, {volume}, {icon}
 format_sink_unmuted = "{name} {volume:>3}% {icon}"
 format_sink_muted = "{name} {icon}"
 format_source_unmuted = "{name} {volume:>3}% {icon}"
 format_source_muted = "{name} {icon}"

+[bt]
+# enabled = false  # set to false to disable this module at runtime
+# tokens: {alias}, {mac}, {left}, {right}, {anc}
+format_plugin = "{alias} [{left}|{right}] {anc} 󰂰"
+format_connected = "󰂰 {alias}"
+format_disconnected = "󰂯 Disconnected"
+format_disabled = "󰂲 Off"
+
 [game]
+# enabled = false  # set to false to disable this module at runtime
 format_active = "<span size='large'>󰊖</span>"
 format_inactive = "<span size='large'></span>"
+
+[mpris]
+# enabled = false  # set to false to disable this module at runtime
+# tokens: {artist}, {title}, {album}, {status_icon}
+format = "{status_icon} {artist} - {title}"
+
+[backlight]
+# enabled = false  # set to false to disable this module at runtime
+# tokens: {percentage}, {icon}
+format = "{percentage:>3}% {icon}"
+
+[keyboard]
+# enabled = false  # set to false to disable this module at runtime
+# tokens: {layout}
+format = "{layout}"
+
+[dnd]
+# enabled = false  # set to false to disable this module at runtime
+format_dnd = "<span size='large'>󰂛</span>"
+format_normal = "<span size='large'>󰂚</span>"
@@ -1,8 +1,6 @@
-use regex::Regex;
 use serde::Deserialize;
 use std::fs;
 use std::path::PathBuf;
-use std::sync::LazyLock;
 use tracing::{debug, info, warn};

 #[derive(Deserialize, Default, Clone)]
@@ -10,27 +8,52 @@ pub struct Config {
    #[serde(default)]
    pub general: GeneralConfig,
    #[serde(default)]
+    pub signals: SignalsConfig,
+    #[cfg(feature = "mod-network")]
+    #[serde(default)]
    pub network: NetworkConfig,
+    #[cfg(feature = "mod-hardware")]
    #[serde(default)]
    pub cpu: CpuConfig,
+    #[cfg(feature = "mod-hardware")]
    #[serde(default)]
    pub memory: MemoryConfig,
+    #[cfg(feature = "mod-hardware")]
    #[serde(default)]
    pub gpu: GpuConfig,
+    #[cfg(feature = "mod-hardware")]
    #[serde(default)]
    pub sys: SysConfig,
+    #[cfg(feature = "mod-hardware")]
    #[serde(default)]
    pub disk: DiskConfig,
+    #[cfg(feature = "mod-hardware")]
    #[serde(default)]
    pub pool: PoolConfig,
+    #[cfg(feature = "mod-hardware")]
    #[serde(default)]
    pub power: PowerConfig,
+    #[cfg(feature = "mod-audio")]
    #[serde(default)]
    pub audio: AudioConfig,
+    #[cfg(feature = "mod-bt")]
    #[serde(default)]
    pub bt: BtConfig,
+    #[cfg(feature = "mod-hardware")]
    #[serde(default)]
    pub game: GameConfig,
+    #[cfg(feature = "mod-dbus")]
+    #[serde(default)]
+    pub mpris: MprisConfig,
+    #[cfg(feature = "mod-dbus")]
+    #[serde(default)]
+    pub backlight: BacklightConfig,
+    #[cfg(feature = "mod-dbus")]
+    #[serde(default)]
+    pub keyboard: KeyboardConfig,
+    #[cfg(feature = "mod-dbus")]
+    #[serde(default)]
+    pub dnd: DndConfig,
 }

 #[derive(Deserialize, Clone)]
@@ -41,19 +64,42 @@ pub struct GeneralConfig {
 impl Default for GeneralConfig {
    fn default() -> Self {
        Self {
-            menu_command: "fuzzel --dmenu --prompt '{prompt}'".to_string(),
+            menu_command: "fuzzel --dmenu --prompt \"$FLUXO_PROMPT\"".to_string(),
        }
    }
 }

+#[allow(dead_code)]
+#[derive(Deserialize, Default, Clone)]
+pub struct SignalsConfig {
+    pub network: Option<i32>,
+    pub cpu: Option<i32>,
+    pub memory: Option<i32>,
+    pub gpu: Option<i32>,
+    pub sys: Option<i32>,
+    pub disk: Option<i32>,
+    pub pool: Option<i32>,
+    pub power: Option<i32>,
+    pub audio: Option<i32>,
+    pub bt: Option<i32>,
+    pub game: Option<i32>,
+    pub mpris: Option<i32>,
+    pub backlight: Option<i32>,
+    pub keyboard: Option<i32>,
+    pub dnd: Option<i32>,
+}
+
 #[derive(Deserialize, Clone)]
 pub struct NetworkConfig {
+    #[serde(default = "default_true")]
+    pub enabled: bool,
    pub format: String,
 }

 impl Default for NetworkConfig {
    fn default() -> Self {
        Self {
+            enabled: true,
            format: "{interface} ({ip}):  {rx:>5.2} MB/s   {tx:>5.2} MB/s".to_string(),
        }
    }
@@ -61,12 +107,15 @@ impl Default for NetworkConfig {

 #[derive(Deserialize, Clone)]
 pub struct CpuConfig {
+    #[serde(default = "default_true")]
+    pub enabled: bool,
    pub format: String,
 }

 impl Default for CpuConfig {
    fn default() -> Self {
        Self {
+            enabled: true,
            format: "CPU: {usage:>4.1}% {temp:>4.1}C".to_string(),
        }
    }
@@ -74,12 +123,15 @@ impl Default for CpuConfig {

 #[derive(Deserialize, Clone)]
 pub struct MemoryConfig {
+    #[serde(default = "default_true")]
+    pub enabled: bool,
    pub format: String,
 }

 impl Default for MemoryConfig {
    fn default() -> Self {
        Self {
+            enabled: true,
            format: "{used:>5.2}/{total:>5.2}GB".to_string(),
        }
    }
@@ -87,6 +139,8 @@ impl Default for MemoryConfig {

 #[derive(Deserialize, Clone)]
 pub struct GpuConfig {
+    #[serde(default = "default_true")]
+    pub enabled: bool,
    pub format_amd: String,
    pub format_intel: String,
    pub format_nvidia: String,
@@ -95,6 +149,7 @@ pub struct GpuConfig {
 impl Default for GpuConfig {
    fn default() -> Self {
        Self {
+            enabled: true,
            format_amd: "AMD: {usage:>3.0}% {vram_used:>4.1}/{vram_total:>4.1}GB {temp:>4.1}C"
                .to_string(),
            format_intel: "iGPU: {usage:>3.0}%".to_string(),
@@ -106,12 +161,15 @@ impl Default for GpuConfig {

 #[derive(Deserialize, Clone)]
 pub struct SysConfig {
+    #[serde(default = "default_true")]
+    pub enabled: bool,
    pub format: String,
 }

 impl Default for SysConfig {
    fn default() -> Self {
        Self {
+            enabled: true,
            format: "UP: {uptime} | LOAD: {load1:>4.2} {load5:>4.2} {load15:>4.2}".to_string(),
        }
    }
@@ -119,12 +177,15 @@ impl Default for SysConfig {

 #[derive(Deserialize, Clone)]
 pub struct DiskConfig {
+    #[serde(default = "default_true")]
+    pub enabled: bool,
    pub format: String,
 }

 impl Default for DiskConfig {
    fn default() -> Self {
        Self {
+            enabled: true,
            format: "{mount} {used:>5.1}/{total:>5.1}G".to_string(),
        }
    }
@@ -132,12 +193,15 @@ impl Default for DiskConfig {

 #[derive(Deserialize, Clone)]
 pub struct PoolConfig {
+    #[serde(default = "default_true")]
+    pub enabled: bool,
    pub format: String,
 }

 impl Default for PoolConfig {
    fn default() -> Self {
        Self {
+            enabled: true,
            format: "{used:>4.0}G / {total:>4.0}G".to_string(),
        }
    }
@@ -145,12 +209,15 @@ impl Default for PoolConfig {

 #[derive(Deserialize, Clone)]
 pub struct PowerConfig {
+    #[serde(default = "default_true")]
+    pub enabled: bool,
    pub format: String,
 }

 impl Default for PowerConfig {
    fn default() -> Self {
        Self {
+            enabled: true,
            format: "{percentage:>3}%  {icon}".to_string(),
        }
    }
@@ -158,6 +225,8 @@ impl Default for PowerConfig {

 #[derive(Deserialize, Clone)]
 pub struct AudioConfig {
+    #[serde(default = "default_true")]
+    pub enabled: bool,
    pub format_sink_unmuted: String,
    pub format_sink_muted: String,
    pub format_source_unmuted: String,
@@ -167,6 +236,7 @@ pub struct AudioConfig {
 impl Default for AudioConfig {
    fn default() -> Self {
        Self {
+            enabled: true,
            format_sink_unmuted: "{name} {volume:>3}% {icon}".to_string(),
            format_sink_muted: "{name} {icon}".to_string(),
            format_source_unmuted: "{name} {volume:>3}% {icon}".to_string(),
@@ -177,6 +247,8 @@ impl Default for AudioConfig {

 #[derive(Deserialize, Clone)]
 pub struct BtConfig {
+    #[serde(default = "default_true")]
+    pub enabled: bool,
    pub format_connected: String,
    pub format_plugin: String,
    pub format_disconnected: String,
@@ -186,6 +258,7 @@ pub struct BtConfig {
 impl Default for BtConfig {
    fn default() -> Self {
        Self {
+            enabled: true,
            format_connected: "{alias} 󰂰".to_string(),
            format_plugin: "{alias} [{left}|{right}] {anc} 󰂰".to_string(),
            format_disconnected: "󰂯".to_string(),
@@ -196,6 +269,8 @@ impl Default for BtConfig {

 #[derive(Deserialize, Clone)]
 pub struct GameConfig {
+    #[serde(default = "default_true")]
+    pub enabled: bool,
    pub format_active: String,
    pub format_inactive: String,
 }
@@ -203,17 +278,85 @@ pub struct GameConfig {
 impl Default for GameConfig {
    fn default() -> Self {
        Self {
+            enabled: true,
            format_active: "<span size='large'>󰊖</span>".to_string(),
            format_inactive: "<span size='large'></span>".to_string(),
        }
    }
 }

-static TOKEN_RE: LazyLock<Regex> =
-    LazyLock::new(|| Regex::new(r"\{([a-zA-Z0-9_]+)(?::([<>\^])?(\d+)?(?:\.(\d+))?)?\}").unwrap());
+#[derive(Deserialize, Clone)]
+pub struct MprisConfig {
+    #[serde(default = "default_true")]
+    pub enabled: bool,
+    pub format: String,
+}
+
+impl Default for MprisConfig {
+    fn default() -> Self {
+        Self {
+            enabled: true,
+            format: "{status_icon} {artist} - {title}".to_string(),
+        }
+    }
+}
+
+#[derive(Deserialize, Clone)]
+pub struct BacklightConfig {
+    #[serde(default = "default_true")]
+    pub enabled: bool,
+    pub format: String,
+}
+
+impl Default for BacklightConfig {
+    fn default() -> Self {
+        Self {
+            enabled: true,
+            format: "{percentage:>3}% {icon}".to_string(),
+        }
+    }
+}
+
+#[derive(Deserialize, Clone)]
+pub struct KeyboardConfig {
+    #[serde(default = "default_true")]
+    pub enabled: bool,
+    pub format: String,
+}
+
+impl Default for KeyboardConfig {
+    fn default() -> Self {
+        Self {
+            enabled: true,
+            format: "{layout}".to_string(),
+        }
+    }
+}
+
+#[derive(Deserialize, Clone)]
+pub struct DndConfig {
+    #[serde(default = "default_true")]
+    pub enabled: bool,
+    pub format_dnd: String,
+    pub format_normal: String,
+}
+
+fn default_true() -> bool {
+    true
+}
+
+impl Default for DndConfig {
+    fn default() -> Self {
+        Self {
+            enabled: true,
+            format_dnd: "<span size='large'>󰂛</span>".to_string(),
+            format_normal: "<span size='large'>󰂚</span>".to_string(),
+        }
+    }
+}

 fn extract_tokens(format_str: &str) -> Vec<String> {
-    TOKEN_RE
+    crate::utils::TOKEN_RE
        .captures_iter(format_str)
        .map(|cap| cap[1].to_string())
        .collect()
@@ -231,12 +374,53 @@ fn validate_format(label: &str, format_str: &str, known_tokens: &[&str]) {
 }

 impl Config {
+    /// Check if a module is enabled in the configuration.
+    /// Returns false if the module is explicitly disabled; true if enabled or unknown.
+    pub fn is_module_enabled(&self, module_name: &str) -> bool {
+        match module_name {
+            #[cfg(feature = "mod-network")]
+            "net" | "network" => self.network.enabled,
+            #[cfg(feature = "mod-hardware")]
+            "cpu" => self.cpu.enabled,
+            #[cfg(feature = "mod-hardware")]
+            "mem" | "memory" => self.memory.enabled,
+            #[cfg(feature = "mod-hardware")]
+            "gpu" => self.gpu.enabled,
+            #[cfg(feature = "mod-hardware")]
+            "sys" => self.sys.enabled,
+            #[cfg(feature = "mod-hardware")]
+            "disk" => self.disk.enabled,
+            #[cfg(feature = "mod-hardware")]
+            "pool" | "btrfs" => self.pool.enabled,
+            #[cfg(feature = "mod-hardware")]
+            "power" => self.power.enabled,
+            #[cfg(feature = "mod-hardware")]
+            "game" => self.game.enabled,
+            #[cfg(feature = "mod-audio")]
+            "vol" | "audio" | "mic" => self.audio.enabled,
+            #[cfg(feature = "mod-bt")]
+            "bt" | "bluetooth" => self.bt.enabled,
+            #[cfg(feature = "mod-dbus")]
+            "mpris" => self.mpris.enabled,
+            #[cfg(feature = "mod-dbus")]
+            "backlight" => self.backlight.enabled,
+            #[cfg(feature = "mod-dbus")]
+            "kbd" | "keyboard" => self.keyboard.enabled,
+            #[cfg(feature = "mod-dbus")]
+            "dnd" => self.dnd.enabled,
+            _ => true,
+        }
+    }
+
    pub fn validate(&self) {
+        #[cfg(feature = "mod-network")]
        validate_format(
            "network",
            &self.network.format,
            &["interface", "ip", "rx", "tx"],
        );
+        #[cfg(feature = "mod-hardware")]
+        {
            validate_format("cpu", &self.cpu.format, &["usage", "temp"]);
            validate_format("memory", &self.memory.format, &["used", "total"]);
            validate_format(
@@ -258,6 +442,9 @@ impl Config {
            validate_format("disk", &self.disk.format, &["mount", "used", "total"]);
            validate_format("pool", &self.pool.format, &["used", "total"]);
            validate_format("power", &self.power.format, &["percentage", "icon"]);
+        }
+        #[cfg(feature = "mod-audio")]
+        {
            validate_format(
                "audio.sink_unmuted",
                &self.audio.format_sink_unmuted,
@@ -278,6 +465,9 @@ impl Config {
                &self.audio.format_source_muted,
                &["name", "icon"],
            );
+        }
+        #[cfg(feature = "mod-bt")]
+        {
            validate_format("bt.connected", &self.bt.format_connected, &["alias"]);
            validate_format(
                "bt.plugin",
@@ -285,10 +475,20 @@ impl Config {
                &["alias", "left", "right", "anc", "mac"],
            );
        }
+        #[cfg(feature = "mod-dbus")]
+        {
+            validate_format(
+                "mpris",
+                &self.mpris.format,
+                &["artist", "title", "album", "status_icon"],
+            );
+            validate_format("backlight", &self.backlight.format, &["percentage", "icon"]);
+            validate_format("keyboard", &self.keyboard.format, &["layout"]);
+        }
+    }
 }

-pub fn load_config(custom_path: Option<PathBuf>) -> Config {
-    let config_path = custom_path.unwrap_or_else(|| {
+pub fn default_config_path() -> PathBuf {
    let config_dir = std::env::var("XDG_CONFIG_HOME")
        .map(PathBuf::from)
        .unwrap_or_else(|_| {
@@ -296,7 +496,10 @@ pub fn load_config(custom_path: Option<PathBuf>) -> Config {
            PathBuf::from(home).join(".config")
        });
    config_dir.join("fluxo/config.toml")
-    });
+}
+
+pub fn load_config(custom_path: Option<PathBuf>) -> Config {
+    let config_path = custom_path.unwrap_or_else(default_config_path);

    if let Ok(content) = fs::read_to_string(&config_path) {
        match toml::from_str::<Config>(&content) {
@@ -330,7 +533,7 @@ mod tests {
        let config = Config::default();
        assert_eq!(
            config.general.menu_command,
-            "fuzzel --dmenu --prompt '{prompt}'"
+            "fuzzel --dmenu --prompt \"$FLUXO_PROMPT\""
        );
        assert!(config.cpu.format.contains("usage"));
        assert!(config.cpu.format.contains("temp"));
@@ -344,7 +547,7 @@ mod tests {
        // Should fallback to defaults without panicking
        assert_eq!(
            config.general.menu_command,
-            "fuzzel --dmenu --prompt '{prompt}'"
+            "fuzzel --dmenu --prompt \"$FLUXO_PROMPT\""
        );
    }

@@ -371,7 +574,7 @@ mod tests {
        // Should fallback to defaults
        assert_eq!(
            config.general.menu_command,
-            "fuzzel --dmenu --prompt '{prompt}'"
+            "fuzzel --dmenu --prompt \"$FLUXO_PROMPT\""
        );
    }

@@ -383,7 +586,7 @@ mod tests {
        let config = load_config(Some(tmpfile.path().to_path_buf()));
        assert_eq!(
            config.general.menu_command,
-            "fuzzel --dmenu --prompt '{prompt}'"
+            "fuzzel --dmenu --prompt \"$FLUXO_PROMPT\""
        );
        assert!(config.cpu.format.contains("usage"));
    }
@@ -1,21 +1,35 @@
 use crate::config::Config;
-use crate::error::FluxoError;
 use crate::ipc::socket_path;
-use crate::modules::WaybarModule;
+#[cfg(feature = "mod-audio")]
 use crate::modules::audio::AudioDaemon;
+#[cfg(feature = "mod-dbus")]
+use crate::modules::backlight::BacklightDaemon;
+#[cfg(feature = "mod-bt")]
 use crate::modules::bt::BtDaemon;
+#[cfg(feature = "mod-dbus")]
+use crate::modules::dnd::DndDaemon;
+#[cfg(feature = "mod-hardware")]
 use crate::modules::hardware::HardwareDaemon;
+#[cfg(feature = "mod-dbus")]
+use crate::modules::keyboard::KeyboardDaemon;
+#[cfg(feature = "mod-dbus")]
+use crate::modules::mpris::MprisDaemon;
+#[cfg(feature = "mod-network")]
 use crate::modules::network::NetworkDaemon;
-use crate::state::{AppState, SharedState};
+use crate::signaler::WaybarSignaler;
+use crate::state::AppReceivers;
 use anyhow::Result;
+use notify::{Config as NotifyConfig, Event, RecommendedWatcher, RecursiveMode, Watcher};
+use std::collections::HashMap;
 use std::fs;
 use std::path::PathBuf;
 use std::sync::Arc;
 use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
 use tokio::net::UnixListener;
-use tokio::sync::RwLock;
-use tokio::time::{Duration, Instant, sleep};
-use tracing::{debug, error, info, warn};
+use tokio::sync::{RwLock, mpsc, watch};
+use tokio::time::{Duration, sleep};
+use tokio_util::sync::CancellationToken;
+use tracing::{debug, error, info};

 struct SocketGuard {
    path: String,
@@ -28,6 +42,10 @@ impl Drop for SocketGuard {
    }
 }

+fn get_config_path(custom_path: Option<PathBuf>) -> PathBuf {
+    custom_path.unwrap_or_else(crate::config::default_config_path)
+}
+
 pub async fn run_daemon(config_path: Option<PathBuf>) -> Result<()> {
    let sock_path = socket_path();

@@ -36,87 +54,289 @@ pub async fn run_daemon(config_path: Option<PathBuf>) -> Result<()> {
        fs::remove_file(&sock_path)?;
    }

-    let state: SharedState = Arc::new(RwLock::new(AppState::default()));
+    #[cfg(feature = "mod-network")]
+    let (net_tx, net_rx) = watch::channel(Default::default());
+    #[cfg(feature = "mod-hardware")]
+    let (cpu_tx, cpu_rx) = watch::channel(Default::default());
+    #[cfg(feature = "mod-hardware")]
+    let (mem_tx, mem_rx) = watch::channel(Default::default());
+    #[cfg(feature = "mod-hardware")]
+    let (sys_tx, sys_rx) = watch::channel(Default::default());
+    #[cfg(feature = "mod-hardware")]
+    let (gpu_tx, gpu_rx) = watch::channel(Default::default());
+    #[cfg(feature = "mod-hardware")]
+    let (disks_tx, disks_rx) = watch::channel(Default::default());
+    #[cfg(feature = "mod-bt")]
+    let (bt_tx, bt_rx) = watch::channel(Default::default());
+    #[cfg(feature = "mod-audio")]
+    let (audio_tx, audio_rx) = watch::channel(Default::default());
+    #[cfg(feature = "mod-dbus")]
+    let (mpris_tx, mpris_rx) = watch::channel(Default::default());
+    #[cfg(feature = "mod-dbus")]
+    let (backlight_tx, backlight_rx) = watch::channel(Default::default());
+    #[cfg(feature = "mod-dbus")]
+    let (keyboard_tx, keyboard_rx) = watch::channel(Default::default());
+    #[cfg(feature = "mod-dbus")]
+    let (dnd_tx, dnd_rx) = watch::channel(Default::default());
+    let health = Arc::new(RwLock::new(HashMap::new()));
+    #[cfg(feature = "mod-bt")]
+    let (bt_force_tx, mut bt_force_rx) = mpsc::channel(1);
+    #[cfg(feature = "mod-audio")]
+    let (audio_cmd_tx, audio_cmd_rx) = mpsc::channel(8);
+
+    let receivers = AppReceivers {
+        #[cfg(feature = "mod-network")]
+        network: net_rx,
+        #[cfg(feature = "mod-hardware")]
+        cpu: cpu_rx,
+        #[cfg(feature = "mod-hardware")]
+        memory: mem_rx,
+        #[cfg(feature = "mod-hardware")]
+        sys: sys_rx,
+        #[cfg(feature = "mod-hardware")]
+        gpu: gpu_rx,
+        #[cfg(feature = "mod-hardware")]
+        disks: disks_rx,
+        #[cfg(feature = "mod-bt")]
+        bluetooth: bt_rx,
+        #[cfg(feature = "mod-audio")]
+        audio: audio_rx,
+        #[cfg(feature = "mod-dbus")]
+        mpris: mpris_rx,
+        #[cfg(feature = "mod-dbus")]
+        backlight: backlight_rx,
+        #[cfg(feature = "mod-dbus")]
+        keyboard: keyboard_rx,
+        #[cfg(feature = "mod-dbus")]
+        dnd: dnd_rx,
+        health: Arc::clone(&health),
+        #[cfg(feature = "mod-bt")]
+        bt_force_poll: bt_force_tx,
+        #[cfg(feature = "mod-audio")]
+        audio_cmd_tx,
+    };
+
    let listener = UnixListener::bind(&sock_path)?;
    let _guard = SocketGuard {
        path: sock_path.clone(),
    };

-    // Signal handling for graceful shutdown in async context
-    let running = Arc::new(tokio::sync::Notify::new());
-    let r_clone = Arc::clone(&running);
+    // Signal handling for graceful shutdown
+    let cancel_token = CancellationToken::new();
+    let token_clone = cancel_token.clone();
    tokio::spawn(async move {
        tokio::signal::ctrl_c().await.unwrap();
        info!("Received shutdown signal, exiting...");
-        r_clone.notify_waiters();
+        token_clone.cancel();
    });

-    let config_path_clone = config_path.clone();
-    let config = Arc::new(RwLock::new(crate::config::load_config(config_path)));
+    let resolved_config_path = get_config_path(config_path.clone());
+    let config = Arc::new(RwLock::new(crate::config::load_config(config_path.clone())));
+
+    // 0. Config Watcher (Hot Reload)
+    let watcher_config = Arc::clone(&config);
+    let watcher_path = resolved_config_path.clone();
+    tokio::spawn(async move {
+        let (ev_tx, mut ev_rx) = mpsc::channel(1);
+        let mut watcher = RecommendedWatcher::new(
+            move |res: notify::Result<Event>| {
+                if let Ok(event) = res
+                    && (event.kind.is_modify() || event.kind.is_create())
+                {
+                    let _ = ev_tx.blocking_send(());
+                }
+            },
+            NotifyConfig::default(),
+        )
+        .unwrap();
+
+        if let Some(parent) = watcher_path.parent() {
+            let _ = watcher.watch(parent, RecursiveMode::NonRecursive);
+        }
+
+        info!("Config watcher started on {:?}", watcher_path);
+
+        loop {
+            tokio::select! {
+                _ = ev_rx.recv() => {
+                    // Debounce reloads
+                    sleep(Duration::from_millis(100)).await;
+                    while ev_rx.try_recv().is_ok() {}
+                    reload_config(&watcher_config, Some(watcher_path.clone())).await;
+                }
+            }
+        }
+    });
+
+    // 0.1 SIGHUP Handler
+    let hup_config = Arc::clone(&config);
+    let hup_path = resolved_config_path.clone();
+    tokio::spawn(async move {
+        use tokio::signal::unix::{SignalKind, signal};
+        let mut stream = signal(SignalKind::hangup()).unwrap();
+        loop {
+            stream.recv().await;
+            info!("Received SIGHUP, reloading config...");
+            reload_config(&hup_config, Some(hup_path.clone())).await;
+        }
+    });

    // 1. Network Task
-    let poll_state = Arc::clone(&state);
+    #[cfg(feature = "mod-network")]
+    if config.read().await.network.enabled {
+        let token = cancel_token.clone();
+        let net_health = Arc::clone(&health);
        tokio::spawn(async move {
            info!("Starting Network polling task");
            let mut daemon = NetworkDaemon::new();
            loop {
-            daemon.poll(Arc::clone(&poll_state)).await;
-            sleep(Duration::from_secs(1)).await;
+                if !crate::health::is_poll_in_backoff("net", &net_health).await {
+                    let res = daemon.poll(&net_tx).await;
+                    crate::health::handle_poll_result("net", res, &net_health).await;
                }
+                tokio::select! {
+                    _ = token.cancelled() => break,
+                    _ = sleep(Duration::from_secs(1)) => {}
+                }
+            }
+            info!("Network task shut down.");
        });
+    }

    // 2. Fast Hardware Task (CPU, Mem, Load)
-    let poll_state = Arc::clone(&state);
+    #[cfg(feature = "mod-hardware")]
+    {
+        let cfg = config.read().await;
+        let fast_enabled = cfg.cpu.enabled || cfg.memory.enabled || cfg.sys.enabled;
+        drop(cfg);
+        if fast_enabled {
+            let token = cancel_token.clone();
+            let hw_health = Arc::clone(&health);
            tokio::spawn(async move {
                info!("Starting Fast Hardware polling task");
                let mut daemon = HardwareDaemon::new();
                loop {
-            daemon.poll_fast(Arc::clone(&poll_state)).await;
-            sleep(Duration::from_secs(1)).await;
+                    if !crate::health::is_poll_in_backoff("cpu", &hw_health).await {
+                        daemon.poll_fast(&cpu_tx, &mem_tx, &sys_tx).await;
                    }
+                    tokio::select! {
+                        _ = token.cancelled() => break,
+                        _ = sleep(Duration::from_secs(1)) => {}
+                    }
+                }
+                info!("Fast Hardware task shut down.");
            });
+        }
+    }

    // 3. Slow Hardware Task (GPU, Disks)
-    let poll_state = Arc::clone(&state);
+    #[cfg(feature = "mod-hardware")]
+    {
+        let cfg = config.read().await;
+        let slow_enabled = cfg.gpu.enabled || cfg.disk.enabled;
+        drop(cfg);
+        if slow_enabled {
+            let token = cancel_token.clone();
+            let slow_health = Arc::clone(&health);
            tokio::spawn(async move {
                info!("Starting Slow Hardware polling task");
                let mut daemon = HardwareDaemon::new();
                loop {
-            daemon.poll_slow(Arc::clone(&poll_state)).await;
-            sleep(Duration::from_secs(1)).await;
+                    if !crate::health::is_poll_in_backoff("gpu", &slow_health).await {
+                        daemon.poll_slow(&gpu_tx, &disks_tx).await;
                    }
+                    tokio::select! {
+                        _ = token.cancelled() => break,
+                        _ = sleep(Duration::from_secs(5)) => {}
+                    }
+                }
+                info!("Slow Hardware task shut down.");
            });
+        }
+    }

    // 4. Bluetooth Task
-    let poll_state = Arc::clone(&state);
+    #[cfg(feature = "mod-bt")]
+    if config.read().await.bt.enabled {
+        let token = cancel_token.clone();
+        let bt_health = Arc::clone(&health);
        let poll_config = Arc::clone(&config);
+        let poll_receivers = receivers.clone();
        tokio::spawn(async move {
            info!("Starting Bluetooth polling task");
            let mut daemon = BtDaemon::new();
            loop {
+                if !crate::health::is_poll_in_backoff("bt", &bt_health).await {
                    let config = poll_config.read().await;
-            daemon.poll(Arc::clone(&poll_state), &config).await;
-            sleep(Duration::from_secs(1)).await;
+                    daemon.poll(&bt_tx, &poll_receivers, &config).await;
                }
+                tokio::select! {
+                    _ = token.cancelled() => break,
+                    _ = bt_force_rx.recv() => {},
+                    _ = sleep(Duration::from_secs(2)) => {}
+                }
+            }
+            info!("Bluetooth task shut down.");
        });
+    }

-    // 5. Audio Thread (Event driven - pulse usually needs its own thread)
+    // 5. Audio Thread (Event driven)
+    #[cfg(feature = "mod-audio")]
+    if config.read().await.audio.enabled {
        let audio_daemon = AudioDaemon::new();
-    audio_daemon.start(Arc::clone(&state));
+        audio_daemon.start(&audio_tx, audio_cmd_rx);
+    }
+
+    // 5.1 Backlight Thread (Event driven)
+    #[cfg(feature = "mod-dbus")]
+    if config.read().await.backlight.enabled {
+        let backlight_daemon = BacklightDaemon::new();
+        backlight_daemon.start(backlight_tx);
+    }
+
+    // 5.2 Keyboard Thread (Event driven)
+    #[cfg(feature = "mod-dbus")]
+    if config.read().await.keyboard.enabled {
+        let keyboard_daemon = KeyboardDaemon::new();
+        keyboard_daemon.start(keyboard_tx);
+    }
+
+    // 5.3 DND Thread (Event driven)
+    #[cfg(feature = "mod-dbus")]
+    if config.read().await.dnd.enabled {
+        let dnd_daemon = DndDaemon::new();
+        dnd_daemon.start(dnd_tx);
+    }
+
+    // 5.4 MPRIS Thread
+    #[cfg(feature = "mod-dbus")]
+    if config.read().await.mpris.enabled {
+        let mpris_daemon = MprisDaemon::new();
+        mpris_daemon.start(mpris_tx);
+    }
+
+    // 6. Waybar Signaler Task
+    let signaler = WaybarSignaler::new();
+    let sig_config = Arc::clone(&config);
+    let sig_receivers = receivers.clone();
+    tokio::spawn(async move {
+        info!("Starting Waybar Signaler task");
+        signaler.run(sig_config, sig_receivers).await;
+    });

    info!("Fluxo daemon successfully bound to socket: {}", sock_path);

    loop {
        tokio::select! {
-            _ = running.notified() => {
+            _ = cancel_token.cancelled() => {
                break;
            }
            res = listener.accept() => {
                match res {
                    Ok((mut stream, _)) => {
-                        let state_clone = Arc::clone(&state);
+                        let state_clone = receivers.clone();
                        let config_clone = Arc::clone(&config);
-                        let cp_clone = config_path_clone.clone();
+                        let cp_clone = config_path.clone();
                        tokio::spawn(async move {
                            let (reader, mut writer) = stream.split();
                            let mut reader = BufReader::new(reader);
@@ -134,12 +354,8 @@ pub async fn run_daemon(config_path: Option<PathBuf>) -> Result<()> {
                            let parts: Vec<&str> = request.split_whitespace().collect();
                            if let Some(module_name) = parts.first() {
                                if *module_name == "reload" {
-                                    info!("Reloading configuration...");
-                                    let new_config = crate::config::load_config(cp_clone);
-                                    let mut config_lock = config_clone.write().await;
-                                    *config_lock = new_config;
+                                    reload_config(&config_clone, cp_clone).await;
                                    let _ = writer.write_all(b"{\"text\":\"ok\"}").await;
-                                    info!("Configuration reloaded successfully.");
                                    return;
                                }

@@ -171,131 +387,48 @@ pub async fn run_daemon(config_path: Option<PathBuf>) -> Result<()> {
    Ok(())
 }

+pub async fn reload_config(config_lock: &Arc<RwLock<Config>>, path: Option<PathBuf>) {
+    info!("Reloading configuration...");
+    let new_config = crate::config::load_config(path);
+    let mut lock = config_lock.write().await;
+    *lock = new_config;
+    info!("Configuration reloaded successfully.");
+}
+
+pub async fn evaluate_module_for_signaler(
+    module_name: &str,
+    state: &AppReceivers,
+    config: &Config,
+) -> Option<String> {
+    let args = crate::registry::signaler_default_args(module_name);
+    crate::registry::dispatch(module_name, config, state, args)
+        .await
+        .ok()
+        .and_then(|out| serde_json::to_string(&out).ok())
+}
+
 async fn handle_request(
    module_name: &str,
    args: &[&str],
-    state: &SharedState,
+    state: &AppReceivers,
    config_lock: &Arc<RwLock<Config>>,
 ) -> String {
-    // 1. Check Circuit Breaker status
-    let is_in_backoff = {
-        let lock = state.read().await;
-        if let Some(health) = lock.health.get(module_name) {
-            if let Some(until) = health.backoff_until {
-                Instant::now() < until
-            } else {
-                false
-            }
-        } else {
-            false
-        }
-    };
+    let (is_in_backoff, cached_output) = crate::health::check_backoff(module_name, state).await;

    if is_in_backoff {
-        return format!(
-            "{{\"text\":\"\u{200B}Cooling down ({})\u{200B}\",\"class\":\"error\"}}",
-            module_name
-        );
+        return crate::health::backoff_response(module_name, cached_output);
    }

    let config = config_lock.read().await;
+    let result = crate::registry::dispatch(module_name, &config, state, args).await;

-    let result = match module_name {
-        "net" | "network" => {
-            crate::modules::network::NetworkModule
-                .run(&config, state, args)
-                .await
-        }
-        "cpu" => {
-            crate::modules::cpu::CpuModule
-                .run(&config, state, args)
-                .await
-        }
-        "mem" | "memory" => {
-            crate::modules::memory::MemoryModule
-                .run(&config, state, args)
-                .await
-        }
-        "disk" => {
-            crate::modules::disk::DiskModule
-                .run(&config, state, args)
-                .await
-        }
-        "pool" | "btrfs" => {
-            crate::modules::btrfs::BtrfsModule
-                .run(&config, state, args)
-                .await
-        }
-        "vol" => {
-            crate::modules::audio::AudioModule
-                .run(&config, state, &["sink", args.first().unwrap_or(&"show")])
-                .await
-        }
-        "mic" => {
-            crate::modules::audio::AudioModule
-                .run(&config, state, &["source", args.first().unwrap_or(&"show")])
-                .await
-        }
-        "gpu" => {
-            crate::modules::gpu::GpuModule
-                .run(&config, state, args)
-                .await
-        }
-        "sys" => {
-            crate::modules::sys::SysModule
-                .run(&config, state, args)
-                .await
-        }
-        "bt" | "bluetooth" => crate::modules::bt::BtModule.run(&config, state, args).await,
-        "power" => {
-            crate::modules::power::PowerModule
-                .run(&config, state, args)
-                .await
-        }
-        "game" => {
-            crate::modules::game::GameModule
-                .run(&config, state, args)
-                .await
-        }
-        _ => {
-            warn!("Received request for unknown module: '{}'", module_name);
-            Err(FluxoError::Ipc(format!("Unknown module: {}", module_name)))
-        }
-    };
-
-    // 2. Update Health based on result
-    {
-        let mut lock = state.write().await;
-        let health = lock.health.entry(module_name.to_string()).or_default();
-        match &result {
-            Ok(_) => {
-                health.consecutive_failures = 0;
-                health.backoff_until = None;
-            }
-            Err(e) => {
-                health.consecutive_failures += 1;
-                health.last_failure = Some(Instant::now());
-                if health.consecutive_failures >= 3 {
-                    // Backoff for 30 seconds after 3 failures
-                    health.backoff_until = Some(Instant::now() + Duration::from_secs(30));
-                    warn!(module = module_name, error = %e, "Module entered backoff state due to repeated failures");
-                }
-            }
-        }
-    }
+    crate::health::update_health(module_name, &result, state).await;

    match result {
        Ok(output) => serde_json::to_string(&output).unwrap_or_else(|_| "{}".to_string()),
-        Err(e) => {
-            let error_msg = e.to_string();
-            error!(module = module_name, error = %error_msg, "Module execution failed");
-            let err_out = crate::output::WaybarOutput {
-                text: "\u{200B}Error\u{200B}".to_string(),
-                tooltip: Some(error_msg),
-                class: Some("error".to_string()),
-                percentage: None,
-            };
-            serde_json::to_string(&err_out).unwrap_or_else(|_| "{}".to_string())
-        }
+        Err(crate::error::FluxoError::Disabled(_)) => {
+            "{\"text\":\"\",\"tooltip\":\"Module disabled\",\"class\":\"disabled\"}".to_string()
+        }
+        Err(e) => crate::health::error_response(module_name, &e, cached_output),
    }
 }
@@ -18,14 +18,40 @@ pub enum FluxoError {
    #[error("External system error: {0}")]
    System(String),

+    #[error("Bluetooth error: {0}")]
+    Bluetooth(String),
+
+    #[error("Network error: {0}")]
+    Network(String),
+
+    #[error("Hardware error: {0}")]
+    Hardware(String),
+
    #[error("IO error: {0}")]
    Io(#[from] std::io::Error),

    #[error("Serialization error: {0}")]
    Serialization(#[from] serde_json::Error),

+    #[error("Module disabled: {0}")]
+    Disabled(String),
+
    #[error("Other error: {0}")]
    Other(#[from] anyhow::Error),
 }

+impl FluxoError {
+    pub fn is_transient(&self) -> bool {
+        matches!(
+            self,
+            Self::Io(_)
+                | Self::System(_)
+                | Self::Bluetooth(_)
+                | Self::Network(_)
+                | Self::Hardware(_)
+                | Self::Module { .. }
+        )
+    }
+}
+
 pub type Result<T> = std::result::Result<T, FluxoError>;
@@ -0,0 +1,136 @@
+use crate::output::WaybarOutput;
+use crate::state::{AppReceivers, ModuleHealth};
+use std::collections::HashMap;
+use std::sync::Arc;
+use tokio::sync::RwLock;
+use tokio::time::{Duration, Instant};
+use tracing::{debug, error, info, warn};
+
+/// Check if a module is in backoff (used by request handler).
+pub async fn check_backoff(
+    module_name: &str,
+    state: &AppReceivers,
+) -> (bool, Option<WaybarOutput>) {
+    let lock = state.health.read().await;
+    if let Some(health) = lock.get(module_name) {
+        let in_backoff = health
+            .backoff_until
+            .is_some_and(|until| Instant::now() < until);
+        (in_backoff, health.last_successful_output.clone())
+    } else {
+        (false, None)
+    }
+}
+
+/// Update health after a request dispatch (used by request handler).
+pub async fn update_health(
+    module_name: &str,
+    result: &Result<WaybarOutput, crate::error::FluxoError>,
+    state: &AppReceivers,
+) {
+    let mut lock = state.health.write().await;
+    let health = lock.entry(module_name.to_string()).or_default();
+    match result {
+        Ok(output) => {
+            health.consecutive_failures = 0;
+            health.backoff_until = None;
+            health.last_successful_output = Some(output.clone());
+        }
+        Err(crate::error::FluxoError::Disabled(_)) => {}
+        Err(e) => {
+            health.consecutive_failures += 1;
+            health.last_failure = Some(Instant::now());
+            if health.consecutive_failures >= 3 {
+                health.backoff_until = Some(Instant::now() + Duration::from_secs(30));
+                warn!(module = module_name, error = %e, "Module entered backoff state due to repeated failures");
+            }
+        }
+    }
+}
+
+/// Check if a polling daemon module is in backoff.
+pub async fn is_poll_in_backoff(
+    module_name: &str,
+    health_lock: &Arc<RwLock<HashMap<String, ModuleHealth>>>,
+) -> bool {
+    let lock = health_lock.read().await;
+    if let Some(health) = lock.get(module_name)
+        && let Some(until) = health.backoff_until
+    {
+        return Instant::now() < until;
+    }
+    false
+}
+
+/// Update health after a polling daemon result.
+pub async fn handle_poll_result(
+    module_name: &str,
+    result: crate::error::Result<()>,
+    health_lock: &Arc<RwLock<HashMap<String, ModuleHealth>>>,
+) {
+    let mut lock = health_lock.write().await;
+    let health = lock.entry(module_name.to_string()).or_default();
+
+    match result {
+        Ok(_) => {
+            if health.consecutive_failures > 0 {
+                info!(
+                    module = module_name,
+                    "Module recovered after {} failures", health.consecutive_failures
+                );
+            }
+            health.consecutive_failures = 0;
+            health.backoff_until = None;
+        }
+        Err(e) => {
+            health.consecutive_failures += 1;
+            health.last_failure = Some(Instant::now());
+
+            if !e.is_transient() {
+                health.backoff_until = Some(Instant::now() + Duration::from_secs(60));
+                error!(module = module_name, error = %e, "Fatal module error, entering long cooldown");
+            } else if health.consecutive_failures >= 3 {
+                let backoff_secs = 30 * (2u64.pow(health.consecutive_failures.saturating_sub(3)));
+                let backoff_secs = backoff_secs.min(3600);
+                health.backoff_until = Some(Instant::now() + Duration::from_secs(backoff_secs));
+                warn!(module = module_name, error = %e, backoff = backoff_secs, "Repeated transient failures, entering backoff");
+            } else {
+                debug!(module = module_name, error = %e, "Transient module failure (attempt {})", health.consecutive_failures);
+            }
+        }
+    }
+}
+
+pub fn backoff_response(module_name: &str, cached: Option<WaybarOutput>) -> String {
+    if let Some(mut cached) = cached {
+        let class = cached.class.unwrap_or_default();
+        cached.class = Some(format!("{} warning", class).trim().to_string());
+        return serde_json::to_string(&cached).unwrap_or_else(|_| "{}".to_string());
+    }
+    format!(
+        "{{\"text\":\"\u{200B}Cooling down ({})\u{200B}\",\"class\":\"error\"}}",
+        module_name
+    )
+}
+
+pub fn error_response(
+    module_name: &str,
+    e: &crate::error::FluxoError,
+    cached: Option<WaybarOutput>,
+) -> String {
+    if let Some(mut cached) = cached {
+        let class = cached.class.unwrap_or_default();
+        cached.class = Some(format!("{} warning", class).trim().to_string());
+        return serde_json::to_string(&cached).unwrap_or_else(|_| "{}".to_string());
+    }
+
+    let error_msg = e.to_string();
+    error!(module = module_name, error = %error_msg, "Module execution failed");
+    let err_out = WaybarOutput {
+        text: "\u{200B}Error\u{200B}".to_string(),
+        tooltip: Some(error_msg),
+        class: Some("error".to_string()),
+        percentage: None,
+    };
+    serde_json::to_string(&err_out).unwrap_or_else(|_| "{}".to_string())
+}
@@ -1,9 +1,12 @@
 mod config;
 mod daemon;
 mod error;
+mod health;
 mod ipc;
 mod modules;
 mod output;
+mod registry;
+mod signaler;
 mod state;
 mod utils;

@@ -18,7 +21,14 @@ use tracing_subscriber::{EnvFilter, fmt, prelude::*};
 #[command(about = "A high-performance daemon/client for Waybar custom modules", long_about = None)]
 struct Cli {
    #[command(subcommand)]
-    command: Commands,
+    command: Option<Commands>,
+
+    /// Module name to query or interact with
+    module: Option<String>,
+
+    /// Arguments to pass to the module
+    #[arg(trailing_var_arg = true)]
+    args: Vec<String>,
 }

 #[derive(Subcommand)]
@@ -31,51 +41,6 @@ enum Commands {
    },
    /// Reload the daemon configuration
    Reload,
-    /// Network speed module
-    #[command(alias = "network")]
-    Net,
-    /// CPU usage and temp module
-    Cpu,
-    /// Memory usage module
-    #[command(alias = "memory")]
-    Mem,
-    /// Disk usage module (path defaults to /)
-    Disk {
-        #[arg(default_value = "/")]
-        path: String,
-    },
-    /// Storage pool aggregate module (e.g., btrfs)
-    #[command(alias = "btrfs")]
-    Pool {
-        #[arg(default_value = "btrfs")]
-        kind: String,
-    },
-    /// Audio volume (sink) control
-    Vol {
-        /// Cycle to the next available output device
-        #[arg(short, long)]
-        cycle: bool,
-    },
-    /// Microphone (source) control
-    Mic {
-        /// Cycle to the next available input device
-        #[arg(short, long)]
-        cycle: bool,
-    },
-    /// GPU usage, VRAM, and temp module
-    Gpu,
-    /// System load average and uptime
-    Sys,
-    /// Bluetooth audio device status
-    #[command(alias = "bluetooth")]
-    Bt {
-        #[arg(default_value = "show")]
-        action: String,
-    },
-    /// System power and battery status
-    Power,
-    /// Hyprland gamemode status
-    Game,
 }

 fn main() {
@@ -86,7 +51,8 @@ fn main() {

    let cli = Cli::parse();

-    match &cli.command {
+    if let Some(command) = &cli.command {
+        match command {
            Commands::Daemon { config } => {
                info!("Starting Fluxo daemon...");
                let rt = tokio::runtime::Builder::new_multi_thread()
@@ -106,29 +72,17 @@ fn main() {
                    process::exit(1);
                }
            },
-        Commands::Net => handle_ipc_response(ipc::request_data("net", &[])),
-        Commands::Cpu => handle_ipc_response(ipc::request_data("cpu", &[])),
-        Commands::Mem => handle_ipc_response(ipc::request_data("mem", &[])),
-        Commands::Disk { path } => handle_ipc_response(ipc::request_data("disk", &[path])),
-        Commands::Pool { kind } => handle_ipc_response(ipc::request_data("pool", &[kind])),
-        Commands::Vol { cycle } => {
-            let action = if *cycle { "cycle" } else { "show" };
-            handle_ipc_response(ipc::request_data("vol", &[action]));
        }
-        Commands::Mic { cycle } => {
-            let action = if *cycle { "cycle" } else { "show" };
-            handle_ipc_response(ipc::request_data("mic", &[action]));
+        return;
    }
-        Commands::Gpu => handle_ipc_response(ipc::request_data("gpu", &[])),
-        Commands::Sys => handle_ipc_response(ipc::request_data("sys", &[])),
-        Commands::Bt { action } => {
-            if action == "menu" {
-                // Client-side execution of the menu
-                let config = config::load_config(None);

+    if let Some(module) = &cli.module {
+        // Special case for client-side Bluetooth menu which requires UI
+        #[cfg(feature = "mod-bt")]
+        if module == "bt" && cli.args.first().map(|s| s.as_str()) == Some("menu") {
+            let config = config::load_config(None);
            let mut items = Vec::new();

-                // If connected, show plugin modes and disconnect
            if let Ok(json_str) = ipc::request_data("bt", &["get_modes"])
                && let Ok(val) = serde_json::from_str::<serde_json::Value>(&json_str)
                && let Some(modes_str) = val.get("text").and_then(|t| t.as_str())
@@ -145,23 +99,13 @@ fn main() {

            items.push("--- Connect Device ---".to_string());

-                let devices_out = match std::process::Command::new("bluetoothctl")
-                    .args(["devices"])
-                    .output()
+            if let Ok(json_str) = ipc::request_data("bt", &["menu_data"])
+                && let Ok(val) = serde_json::from_str::<serde_json::Value>(&json_str)
+                && let Some(devices_str) = val.get("text").and_then(|t| t.as_str())
            {
-                    Ok(out) => out,
-                    Err(e) => {
-                        error!("bluetoothctl not found or failed: {}", e);
-                        return;
-                    }
-                };
-                let stdout = String::from_utf8_lossy(&devices_out.stdout);
-
-                for line in stdout.lines() {
-                    if line.starts_with("Device ") {
-                        let parts: Vec<&str> = line.splitn(3, ' ').collect();
-                        if parts.len() == 3 {
-                            items.push(format!("{} ({})", parts[2], parts[1]));
+                for line in devices_str.lines() {
+                    if !line.is_empty() {
+                        items.push(line.to_string());
                    }
                }
            }
@@ -180,9 +124,7 @@ fn main() {
                        && let Some(mac_end) = selected.rfind(')')
                    {
                        let mac = &selected[mac_start + 1..mac_end];
-                            let _ = std::process::Command::new("bluetoothctl")
-                                .args(["connect", mac])
-                                .status();
+                        handle_ipc_response(ipc::request_data("bt", &["connect", mac]));
                    }
                }
            } else {
@@ -190,10 +132,26 @@ fn main() {
            }
            return;
        }
-            handle_ipc_response(ipc::request_data("bt", &[action]));
-        }
-        Commands::Power => handle_ipc_response(ipc::request_data("power", &[])),
-        Commands::Game => handle_ipc_response(ipc::request_data("game", &[])),
+
+        // Generic module dispatch
+        // Translate module-specific shorthand targets
+        let (actual_module, actual_args) = if module == "vol" {
+            let mut new_args = vec!["sink".to_string()];
+            new_args.extend(cli.args.clone());
+            ("vol".to_string(), new_args)
+        } else if module == "mic" {
+            let mut new_args = vec!["source".to_string()];
+            new_args.extend(cli.args.clone());
+            ("vol".to_string(), new_args)
+        } else {
+            (module.clone(), cli.args.clone())
+        };
+
+        let args_ref: Vec<&str> = actual_args.iter().map(|s| s.as_str()).collect();
+        handle_ipc_response(ipc::request_data(&actual_module, &args_ref));
+    } else {
+        println!("Please specify a module or command. See --help.");
+        process::exit(1);
    }
 }

@@ -2,23 +2,29 @@ use crate::config::Config;
 use crate::error::{FluxoError, Result};
 use crate::modules::WaybarModule;
 use crate::output::WaybarOutput;
-use crate::state::SharedState;
+use crate::state::{AppReceivers, AudioState};
 use crate::utils::{TokenValue, format_template};
 use libpulse_binding::callbacks::ListResult;
 use libpulse_binding::context::subscribe::{Facility, InterestMaskSet};
 use libpulse_binding::context::{Context, FlagSet as ContextFlag};
 use libpulse_binding::mainloop::threaded::Mainloop as ThreadedMainloop;
 use libpulse_binding::volume::Volume;
-use std::process::Command;
-use std::sync::{Arc, LazyLock};
+use tokio::sync::{mpsc, watch};
 use tracing::error;

-static RUNTIME: LazyLock<tokio::runtime::Runtime> = LazyLock::new(|| {
-    tokio::runtime::Builder::new_current_thread()
-        .enable_all()
-        .build()
-        .expect("Failed to create Audio tokio runtime")
-});
+pub enum AudioCommand {
+    ChangeVolume {
+        is_sink: bool,
+        step_val: u32,
+        is_up: bool,
+    },
+    ToggleMute {
+        is_sink: bool,
+    },
+    CycleDevice {
+        is_sink: bool,
+    },
+}

 pub struct AudioDaemon;

@@ -27,8 +33,12 @@ impl AudioDaemon {
        Self
    }

-    pub fn start(&self, state: SharedState) {
-        let state_arc = Arc::clone(&state);
+    pub fn start(
+        &self,
+        state_tx: &watch::Sender<AudioState>,
+        mut cmd_rx: mpsc::Receiver<AudioCommand>,
+    ) {
+        let state_tx = state_tx.clone();

        std::thread::spawn(move || {
            let mut mainloop =
@@ -64,7 +74,7 @@ impl AudioDaemon {
            }

            // Initial fetch
-            let _ = fetch_audio_data_sync(&mut context, &state_arc);
+            let _ = fetch_audio_data_sync(&mut context, &state_tx);

            // Subscribe to events
            let interest =
@@ -72,11 +82,12 @@ impl AudioDaemon {
            context.subscribe(interest, |_| {});

            let (tx, rx) = std::sync::mpsc::channel();
+            let tx_cb = tx.clone();

            context.set_subscribe_callback(Some(Box::new(move |facility, _operation, _index| {
                match facility {
                    Some(Facility::Sink) | Some(Facility::Source) | Some(Facility::Server) => {
-                        let _ = tx.send(());
+                        let _ = tx_cb.send(());
                    }
                    _ => {}
                }
@@ -84,14 +95,110 @@ impl AudioDaemon {

            mainloop.unlock();

-            // Background polling loop driven by events or a 2s fallback timeout
            loop {
-                let _ = rx.recv_timeout(Duration::from_secs(2));
-                {
+                if let Ok(cmd) = cmd_rx.try_recv() {
                    mainloop.lock();
-                    let _ = fetch_audio_data_sync(&mut context, &state_arc);
-                    mainloop.unlock();
+                    match cmd {
+                        AudioCommand::ChangeVolume {
+                            is_sink,
+                            step_val,
+                            is_up,
+                        } => {
+                            let current = state_tx.borrow().clone();
+                            let (name, mut vol, channels) = if is_sink {
+                                (
+                                    current.sink.name.clone(),
+                                    current.sink.volume,
+                                    current.sink.channels,
+                                )
+                            } else {
+                                (
+                                    current.source.name.clone(),
+                                    current.source.volume,
+                                    current.source.channels,
+                                )
+                            };
+
+                            if is_up {
+                                vol = vol.saturating_add(step_val as u8).min(150);
+                            } else {
+                                vol = vol.saturating_sub(step_val as u8);
                            }
+
+                            let pulse_vol = Volume(
+                                (vol as f64 / 100.0 * Volume::NORMAL.0 as f64).round() as u32,
+                            );
+                            let mut cvol = libpulse_binding::volume::ChannelVolumes::default();
+                            cvol.set(channels.max(1), pulse_vol);
+
+                            if is_sink {
+                                context
+                                    .introspect()
+                                    .set_sink_volume_by_name(&name, &cvol, None);
+                            } else {
+                                context
+                                    .introspect()
+                                    .set_source_volume_by_name(&name, &cvol, None);
+                            }
+                        }
+                        AudioCommand::ToggleMute { is_sink } => {
+                            let current = state_tx.borrow().clone();
+                            let (name, muted) = if is_sink {
+                                (current.sink.name.clone(), current.sink.muted)
+                            } else {
+                                (current.source.name.clone(), current.source.muted)
+                            };
+
+                            if is_sink {
+                                context
+                                    .introspect()
+                                    .set_sink_mute_by_name(&name, !muted, None);
+                            } else {
+                                context
+                                    .introspect()
+                                    .set_source_mute_by_name(&name, !muted, None);
+                            }
+                        }
+                        AudioCommand::CycleDevice { is_sink } => {
+                            let current = state_tx.borrow().clone();
+                            let current_name = if is_sink {
+                                current.sink.name.clone()
+                            } else {
+                                current.source.name.clone()
+                            };
+
+                            let devices = if is_sink {
+                                &current.available_sinks
+                            } else {
+                                &current.available_sources
+                            };
+                            if !devices.is_empty() {
+                                let current_idx =
+                                    devices.iter().position(|d| d == &current_name).unwrap_or(0);
+                                let next_idx = (current_idx + 1) % devices.len();
+                                let next_dev = &devices[next_idx];
+
+                                if is_sink {
+                                    context.set_default_sink(next_dev, |_| {});
+                                } else {
+                                    context.set_default_source(next_dev, |_| {});
+                                }
+                            }
+                        }
+                    }
+                    mainloop.unlock();
+                    let _ = tx.send(());
+                }
+
+                let _ = rx.recv_timeout(Duration::from_millis(50));
+                while rx.try_recv().is_ok() {}
+
+                mainloop.lock();
+
+                // Fetch data and update available sinks/sources
+                let _ = fetch_audio_data_sync(&mut context, &state_tx);
+
+                mainloop.unlock();
            }
        });
    }
@@ -99,69 +206,109 @@ impl AudioDaemon {

 use std::time::Duration;

-fn fetch_audio_data_sync(context: &mut Context, state: &SharedState) -> Result<()> {
-    let state_inner = Arc::clone(state);
-
+fn fetch_audio_data_sync(
+    context: &mut Context,
+    state_tx: &watch::Sender<AudioState>,
+) -> Result<()> {
    // We fetch all sinks and sources, and also server info to know defaults.
    // The order doesn't strictly matter as long as we update correctly.

-    let st_server = Arc::clone(&state_inner);
+    let tx_server = state_tx.clone();
    context.introspect().get_server_info(move |info| {
-        let mut lock = RUNTIME.block_on(st_server.write());
-        lock.audio.sink.name = info
+        let mut current = tx_server.borrow().clone();
+        current.sink.name = info
            .default_sink_name
            .as_ref()
            .map(|s| s.to_string())
            .unwrap_or_default();
-        lock.audio.source.name = info
+        current.source.name = info
            .default_source_name
            .as_ref()
            .map(|s| s.to_string())
            .unwrap_or_default();
+        let _ = tx_server.send(current);
    });

-    let st_sink = Arc::clone(&state_inner);
+    let tx_sink = state_tx.clone();
    context.introspect().get_sink_info_list(move |res| {
-        if let ListResult::Item(item) = res {
-            let mut lock = RUNTIME.block_on(st_sink.write());
-            // If this matches our default sink name, or if we don't have details for any yet
+        let mut current = tx_sink.borrow().clone();
+        match res {
+            ListResult::Item(item) => {
+                if let Some(name) = item.name.as_ref() {
+                    let name_str = name.to_string();
+                    if !current.available_sinks.contains(&name_str) {
+                        current.available_sinks.push(name_str);
+                    }
+                }
+
                let is_default = item
                    .name
                    .as_ref()
-                .map(|s| s.as_ref() == lock.audio.sink.name)
+                    .map(|s| s.as_ref() == current.sink.name)
                    .unwrap_or(false);
                if is_default {
-                lock.audio.sink.description = item
+                    current.sink.description = item
                        .description
                        .as_ref()
                        .map(|s| s.to_string())
                        .unwrap_or_default();
-                lock.audio.sink.volume =
-                    ((item.volume.avg().0 as f64 / Volume::NORMAL.0 as f64) * 100.0).round() as u8;
-                lock.audio.sink.muted = item.mute;
+                    current.sink.volume = ((item.volume.avg().0 as f64 / Volume::NORMAL.0 as f64)
+                        * 100.0)
+                        .round() as u8;
+                    current.sink.muted = item.mute;
+                    current.sink.channels = item.volume.len();
                }
+                let _ = tx_sink.send(current);
+            }
+            ListResult::End => {
+                // Clear the list on End so it rebuilds fresh next time
+                current.available_sinks.clear();
+                let _ = tx_sink.send(current);
+            }
+            ListResult::Error => {}
        }
    });

-    let st_source = Arc::clone(&state_inner);
+    let tx_source = state_tx.clone();
    context.introspect().get_source_info_list(move |res| {
-        if let ListResult::Item(item) = res {
-            let mut lock = RUNTIME.block_on(st_source.write());
+        let mut current = tx_source.borrow().clone();
+        match res {
+            ListResult::Item(item) => {
+                if let Some(name) = item.name.as_ref() {
+                    let name_str = name.to_string();
+                    // PulseAudio includes monitor sources, ignore them if we want to
+                    if !name_str.contains(".monitor")
+                        && !current.available_sources.contains(&name_str)
+                    {
+                        current.available_sources.push(name_str);
+                    }
+                }
+
                let is_default = item
                    .name
                    .as_ref()
-                .map(|s| s.as_ref() == lock.audio.source.name)
+                    .map(|s| s.as_ref() == current.source.name)
                    .unwrap_or(false);
                if is_default {
-                lock.audio.source.description = item
+                    current.source.description = item
                        .description
                        .as_ref()
                        .map(|s| s.to_string())
                        .unwrap_or_default();
-                lock.audio.source.volume =
-                    ((item.volume.avg().0 as f64 / Volume::NORMAL.0 as f64) * 100.0).round() as u8;
-                lock.audio.source.muted = item.mute;
+                    current.source.volume = ((item.volume.avg().0 as f64 / Volume::NORMAL.0 as f64)
+                        * 100.0)
+                        .round() as u8;
+                    current.source.muted = item.mute;
+                    current.source.channels = item.volume.len();
                }
+                let _ = tx_source.send(current);
+            }
+            ListResult::End => {
+                // Clear the list on End so it rebuilds fresh next time
+                current.available_sources.clear();
+                let _ = tx_source.send(current);
+            }
+            ListResult::Error => {}
        }
    });

@@ -174,15 +321,28 @@ impl WaybarModule for AudioModule {
    async fn run(
        &self,
        config: &Config,
-        state: &SharedState,
+        state: &AppReceivers,
        args: &[&str],
    ) -> Result<WaybarOutput> {
        let target_type = args.first().unwrap_or(&"sink");
        let action = args.get(1).unwrap_or(&"show");
+        let step = args.get(2).unwrap_or(&"5");

        match *action {
+            "up" => {
+                self.change_volume(state, target_type, step, true).await?;
+                Ok(WaybarOutput::default())
+            }
+            "down" => {
+                self.change_volume(state, target_type, step, false).await?;
+                Ok(WaybarOutput::default())
+            }
+            "mute" => {
+                self.toggle_mute(state, target_type).await?;
+                Ok(WaybarOutput::default())
+            }
            "cycle" => {
-                self.cycle_device(target_type)?;
+                self.cycle_device(state, target_type).await?;
                Ok(WaybarOutput::default())
            }
            "show" => self.get_status(config, state, target_type).await,
@@ -198,13 +358,10 @@ impl AudioModule {
    async fn get_status(
        &self,
        config: &Config,
-        state: &SharedState,
+        state: &AppReceivers,
        target_type: &str,
    ) -> Result<WaybarOutput> {
-        let audio_state = {
-            let lock = state.read().await;
-            lock.audio.clone()
-        };
+        let audio_state = state.audio.borrow().clone();

        let (name, description, volume, muted) = if target_type == "sink" {
            (
@@ -287,69 +444,41 @@ impl AudioModule {
        })
    }

-    fn cycle_device(&self, target_type: &str) -> Result<()> {
-        // Keep using pactl for cycling for now as it's a rare action
-        // but we could also implement it natively later.
-        let set_cmd = if target_type == "sink" {
-            "set-default-sink"
-        } else {
-            "set-default-source"
-        };
-
-        // We need to find the "next" device.
-        // For simplicity, let's keep the CLI version for now or refactor later.
-        // The user asked for "step by step".
-
-        let list_cmd = if target_type == "sink" {
-            "sinks"
-        } else {
-            "sources"
-        };
-        let output = Command::new("pactl")
-            .args(["list", "short", list_cmd])
-            .output()?;
-        let stdout = String::from_utf8_lossy(&output.stdout);
-
-        let devices: Vec<String> = stdout
-            .lines()
-            .filter_map(|l| {
-                let parts: Vec<&str> = l.split_whitespace().collect();
-                if parts.len() >= 2 {
-                    let name = parts[1].to_string();
-                    if target_type == "source" && name.contains(".monitor") {
-                        None
-                    } else {
-                        Some(name)
-                    }
-                } else {
-                    None
-                }
+    async fn change_volume(
+        &self,
+        state: &AppReceivers,
+        target_type: &str,
+        step: &str,
+        is_up: bool,
+    ) -> Result<()> {
+        let is_sink = target_type == "sink";
+        let step_val: u32 = step.parse().unwrap_or(5);
+        let _ = state
+            .audio_cmd_tx
+            .send(AudioCommand::ChangeVolume {
+                is_sink,
+                step_val,
+                is_up,
            })
-            .collect();
-
-        if devices.is_empty() {
-            return Ok(());
+            .await;
+        Ok(())
    }

-        let info_output = Command::new("pactl").args(["info"]).output()?;
-        let info_stdout = String::from_utf8_lossy(&info_output.stdout);
-        let search_key = if target_type == "sink" {
-            "Default Sink:"
-        } else {
-            "Default Source:"
-        };
-        let current_dev = info_stdout
-            .lines()
-            .find(|l| l.contains(search_key))
-            .and_then(|l| l.split(':').nth(1))
-            .map(|s| s.trim())
-            .unwrap_or("");
+    async fn toggle_mute(&self, state: &AppReceivers, target_type: &str) -> Result<()> {
+        let is_sink = target_type == "sink";
+        let _ = state
+            .audio_cmd_tx
+            .send(AudioCommand::ToggleMute { is_sink })
+            .await;
+        Ok(())
+    }

-        let current_index = devices.iter().position(|d| d == current_dev).unwrap_or(0);
-        let next_index = (current_index + 1) % devices.len();
-        let next_dev = &devices[next_index];
-
-        Command::new("pactl").args([set_cmd, next_dev]).status()?;
+    async fn cycle_device(&self, state: &AppReceivers, target_type: &str) -> Result<()> {
+        let is_sink = target_type == "sink";
+        let _ = state
+            .audio_cmd_tx
+            .send(AudioCommand::CycleDevice { is_sink })
+            .await;
        Ok(())
    }
 }
@@ -0,0 +1,154 @@
+use crate::config::Config;
+use crate::error::Result;
+use crate::modules::WaybarModule;
+use crate::output::WaybarOutput;
+use crate::state::{AppReceivers, BacklightState};
+use crate::utils::{TokenValue, format_template};
+use notify::{Config as NotifyConfig, Event, RecommendedWatcher, RecursiveMode, Watcher};
+use std::path::PathBuf;
+use std::sync::mpsc;
+use std::time::Duration;
+use tokio::sync::watch;
+use tracing::{error, info};
+
+pub struct BacklightModule;
+
+impl WaybarModule for BacklightModule {
+    async fn run(
+        &self,
+        config: &Config,
+        state: &AppReceivers,
+        _args: &[&str],
+    ) -> Result<WaybarOutput> {
+        let percentage = state.backlight.borrow().percentage;
+
+        let icon = if percentage < 30 {
+            "󰃞"
+        } else if percentage < 70 {
+            "󰃟"
+        } else {
+            "󰃠"
+        };
+
+        let text = format_template(
+            &config.backlight.format,
+            &[
+                ("percentage", TokenValue::Int(percentage as i64)),
+                ("icon", TokenValue::String(icon.to_string())),
+            ],
+        );
+
+        Ok(WaybarOutput {
+            text,
+            tooltip: Some(format!("Brightness: {}%", percentage)),
+            class: Some("normal".to_string()),
+            percentage: Some(percentage),
+        })
+    }
+}
+
+pub struct BacklightDaemon;
+
+impl BacklightDaemon {
+    pub fn new() -> Self {
+        Self
+    }
+
+    pub fn start(&self, tx: watch::Sender<BacklightState>) {
+        std::thread::spawn(move || {
+            let base_dir = PathBuf::from("/sys/class/backlight");
+            let mut device_dir = None;
+
+            if let Ok(entries) = std::fs::read_dir(&base_dir) {
+                for entry in entries.flatten() {
+                    let path = entry.path();
+                    if path.is_dir() {
+                        device_dir = Some(path);
+                        break;
+                    }
+                }
+            }
+
+            let Some(dir) = device_dir else {
+                error!("No backlight device found in /sys/class/backlight");
+                return;
+            };
+
+            info!("Monitoring backlight device: {:?}", dir);
+
+            let max_brightness_path = dir.join("max_brightness");
+            let brightness_path = dir.join("actual_brightness");
+            let brightness_path_fallback = dir.join("brightness");
+
+            let target_file = if brightness_path.exists() {
+                brightness_path
+            } else {
+                brightness_path_fallback
+            };
+
+            let get_percentage = || -> u8 {
+                let max: f64 = std::fs::read_to_string(&max_brightness_path)
+                    .unwrap_or_default()
+                    .trim()
+                    .parse()
+                    .unwrap_or(100.0);
+                let current: f64 = std::fs::read_to_string(&target_file)
+                    .unwrap_or_default()
+                    .trim()
+                    .parse()
+                    .unwrap_or(0.0);
+
+                if max > 0.0 {
+                    ((current / max) * 100.0).round() as u8
+                } else {
+                    0
+                }
+            };
+
+            // Initial poll
+            let _ = tx.send(BacklightState {
+                percentage: get_percentage(),
+            });
+
+            // Set up notify watcher
+            let (ev_tx, ev_rx) = mpsc::channel();
+            let mut watcher = RecommendedWatcher::new(
+                move |res: notify::Result<Event>| {
+                    if let Ok(event) = res
+                        && event.kind.is_modify()
+                    {
+                        let _ = ev_tx.send(());
+                    }
+                },
+                NotifyConfig::default(),
+            )
+            .unwrap();
+
+            if let Err(e) = watcher.watch(&target_file, RecursiveMode::NonRecursive) {
+                error!("Failed to watch backlight file: {}", e);
+                return;
+            }
+
+            loop {
+                // Block until an event occurs or a timeout to catch missed events
+                if ev_rx.recv_timeout(Duration::from_secs(5)).is_ok() {
+                    // Debounce rapid events
+                    std::thread::sleep(Duration::from_millis(50));
+                    while ev_rx.try_recv().is_ok() {}
+
+                    let _ = tx.send(BacklightState {
+                        percentage: get_percentage(),
+                    });
+                } else {
+                    // Timeout hit, poll just in case
+                    let current = get_percentage();
+                    if tx.borrow().percentage != current {
+                        let _ = tx.send(BacklightState {
+                            percentage: current,
+                        });
+                    }
+                }
+            }
+        });
+    }
+}
@@ -1,10 +1,9 @@
 use crate::config::Config;
 use crate::error::{FluxoError, Result as FluxoResult};
-use crate::modules::bt::maestro::{BudsCommand, get_maestro};
-use crate::state::SharedState;
+use crate::modules::bt::maestro::BudsCommand;
+use crate::state::AppReceivers;
 use crate::utils::TokenValue;
 use futures::future::BoxFuture;
-use std::sync::Arc;

 pub trait BtPlugin: Send + Sync {
    fn name(&self) -> &str;
@@ -12,21 +11,21 @@ pub trait BtPlugin: Send + Sync {
    fn get_data(
        &self,
        config: &Config,
-        state: &SharedState,
+        state: &AppReceivers,
        mac: &str,
    ) -> BoxFuture<'static, FluxoResult<Vec<(String, TokenValue)>>>;
    fn get_modes(
        &self,
        mac: &str,
-        state: &SharedState,
+        state: &AppReceivers,
    ) -> BoxFuture<'static, FluxoResult<Vec<String>>>;
    fn set_mode(
        &self,
        mode: &str,
        mac: &str,
-        state: &SharedState,
+        state: &AppReceivers,
    ) -> BoxFuture<'static, FluxoResult<()>>;
-    fn cycle_mode(&self, mac: &str, state: &SharedState) -> BoxFuture<'static, FluxoResult<()>>;
+    fn cycle_mode(&self, mac: &str, state: &AppReceivers) -> BoxFuture<'static, FluxoResult<()>>;
 }

 pub struct PixelBudsPlugin;
@@ -43,13 +42,13 @@ impl BtPlugin for PixelBudsPlugin {
    fn get_data(
        &self,
        _config: &Config,
-        state: &SharedState,
+        state: &AppReceivers,
        mac: &str,
    ) -> BoxFuture<'static, FluxoResult<Vec<(String, TokenValue)>>> {
        let mac = mac.to_string();
-        let state = Arc::clone(state);
+        let state = state.clone();
        Box::pin(async move {
-            let maestro = get_maestro(&state);
+            let maestro = crate::modules::bt::maestro::get_maestro(&state);
            maestro.ensure_task(&mac);
            let status = maestro.get_status(&mac);

@@ -91,7 +90,7 @@ impl BtPlugin for PixelBudsPlugin {
    fn get_modes(
        &self,
        _mac: &str,
-        _state: &SharedState,
+        _state: &AppReceivers,
    ) -> BoxFuture<'static, FluxoResult<Vec<String>>> {
        Box::pin(async move {
            Ok(vec![
@@ -106,13 +105,13 @@ impl BtPlugin for PixelBudsPlugin {
        &self,
        mode: &str,
        mac: &str,
-        state: &SharedState,
+        state: &AppReceivers,
    ) -> BoxFuture<'static, FluxoResult<()>> {
        let mode = mode.to_string();
        let mac = mac.to_string();
-        let state = Arc::clone(state);
+        let state = state.clone();
        Box::pin(async move {
-            get_maestro(&state)
+            crate::modules::bt::maestro::get_maestro(&state)
                .send_command(&mac, BudsCommand::SetAnc(mode))
                .map_err(|e: anyhow::Error| FluxoError::Module {
                    module: "bt.buds",
@@ -121,17 +120,17 @@ impl BtPlugin for PixelBudsPlugin {
        })
    }

-    fn cycle_mode(&self, mac: &str, state: &SharedState) -> BoxFuture<'static, FluxoResult<()>> {
+    fn cycle_mode(&self, mac: &str, state: &AppReceivers) -> BoxFuture<'static, FluxoResult<()>> {
        let mac = mac.to_string();
-        let state = Arc::clone(state);
+        let state = state.clone();
        Box::pin(async move {
-            let status = get_maestro(&state).get_status(&mac);
+            let status = crate::modules::bt::maestro::get_maestro(&state).get_status(&mac);
            let next_mode = match status.anc_state.as_str() {
                "active" => "aware",
                "aware" => "off",
                _ => "active",
            };
-            get_maestro(&state)
+            crate::modules::bt::maestro::get_maestro(&state)
                .send_command(&mac, BudsCommand::SetAnc(next_mode.to_string()))
                .map_err(|e: anyhow::Error| FluxoError::Module {
                    module: "bt.buds",
@@ -1,4 +1,4 @@
-use crate::state::SharedState;
+use crate::state::AppReceivers;
 use anyhow::{Context, Result};
 use futures::StreamExt;
 use std::collections::HashMap;
@@ -39,11 +39,11 @@ pub struct MaestroManager {
 }

 impl MaestroManager {
-    pub fn new(state: SharedState) -> Self {
+    pub fn new(state: AppReceivers) -> Self {
        let (tx, mut rx) = mpsc::unbounded_channel::<ManagerCommand>();
        let statuses = Arc::new(Mutex::new(HashMap::new()));
        let statuses_clone = Arc::clone(&statuses);
-        let state_clone = Arc::clone(&state);
+        let state_clone = state.clone();

        // Start dedicated BT management thread
        std::thread::spawn(move || {
@@ -68,7 +68,7 @@ impl MaestroManager {

                                        let mac_clone = mac.clone();
                                        let st_clone = Arc::clone(&statuses_clone);
-                                        let state_inner = Arc::clone(&state_clone);
+                                        let state_inner = state_clone.clone();

                                        tokio::task::spawn_local(async move {
                                            if let Err(e) = buds_task(&mac_clone, st_clone, buds_rx, state_inner).await {
@@ -122,7 +122,7 @@ async fn buds_task(
    mac: &str,
    statuses: Arc<Mutex<HashMap<String, BudsStatus>>>,
    mut rx: mpsc::Receiver<BudsCommand>,
-    state: SharedState,
+    state: AppReceivers,
 ) -> Result<()> {
    info!("Starting native Maestro connection task for {}", mac);

@@ -215,8 +215,8 @@ async fn buds_task(

        // Update health
        {
-            let mut lock = state.write().await;
-            let health = lock.health.entry("bt.buds".to_string()).or_default();
+            let mut lock = state.health.write().await;
+            let health = lock.entry("bt.buds".to_string()).or_default();
            health.consecutive_failures = 0;
            health.backoff_until = None;
        }
@@ -357,6 +357,6 @@ pub fn anc_state_to_string(state: &settings::AncState) -> String {

 static MAESTRO: OnceLock<MaestroManager> = OnceLock::new();

-pub fn get_maestro(state: &SharedState) -> &MaestroManager {
-    MAESTRO.get_or_init(|| MaestroManager::new(Arc::clone(state)))
+pub fn get_maestro(state: &AppReceivers) -> &MaestroManager {
+    MAESTRO.get_or_init(|| MaestroManager::new(state.clone()))
 }
@@ -5,11 +5,11 @@ use crate::config::Config;
 use crate::error::Result as FluxoResult;
 use crate::modules::WaybarModule;
 use crate::output::WaybarOutput;
-use crate::state::{BtState, SharedState};
+use crate::state::{AppReceivers, BtState};
 use crate::utils::{TokenValue, format_template};
 use anyhow::Result;
-use std::process::Command;
-use std::sync::{Arc, LazyLock};
+use std::sync::LazyLock;
+use tokio::sync::watch;
 use tracing::{error, warn};

 use self::buds::{BtPlugin, PixelBudsPlugin};
@@ -23,13 +23,23 @@ impl BtDaemon {
        Self { session: None }
    }

-    pub async fn poll(&mut self, state: SharedState, config: &Config) {
-        if let Err(e) = self.poll_async(state, config).await {
+    pub async fn poll(
+        &mut self,
+        tx: &watch::Sender<BtState>,
+        state: &AppReceivers,
+        config: &Config,
+    ) {
+        if let Err(e) = self.poll_async(tx, state, config).await {
            error!("BT daemon error: {}", e);
        }
    }

-    async fn poll_async(&mut self, state: SharedState, config: &Config) -> Result<()> {
+    async fn poll_async(
+        &mut self,
+        tx: &watch::Sender<BtState>,
+        state: &AppReceivers,
+        config: &Config,
+    ) -> Result<()> {
        if self.session.is_none() {
            self.session = Some(bluer::Session::new().await?);
        }
@@ -60,7 +70,7 @@ impl BtDaemon {

                        for p in PLUGINS.iter() {
                            if p.can_handle(&bt_state.device_alias, &bt_state.device_address) {
-                                match p.get_data(config, &state, &bt_state.device_address).await {
+                                match p.get_data(config, state, &bt_state.device_address).await {
                                    Ok(data) => {
                                        bt_state.plugin_data = data
                                            .into_iter()
@@ -90,8 +100,7 @@ impl BtDaemon {
            }
        }

-        let mut lock = state.write().await;
-        lock.bluetooth = bt_state;
+        let _ = tx.send(bt_state);

        Ok(())
    }
@@ -100,39 +109,83 @@ impl BtDaemon {
 static PLUGINS: LazyLock<Vec<Box<dyn BtPlugin>>> =
    LazyLock::new(|| vec![Box::new(PixelBudsPlugin)]);

+fn trigger_robust_poll(state: AppReceivers) {
+    tokio::spawn(async move {
+        // Poll immediately and then a few times over the next few seconds
+        // to catch slow state changes in bluez or plugins.
+        for delay in [200, 500, 1000, 2000, 3000] {
+            tokio::time::sleep(std::time::Duration::from_millis(delay)).await;
+            let _ = state.bt_force_poll.try_send(());
+        }
+    });
+}
+
 pub struct BtModule;

 impl WaybarModule for BtModule {
-    fn run(
+    async fn run(
        &self,
        config: &Config,
-        state: &SharedState,
+        state: &AppReceivers,
        args: &[&str],
-    ) -> impl std::future::Future<Output = FluxoResult<WaybarOutput>> + Send {
+    ) -> FluxoResult<WaybarOutput> {
        let action = args.first().cloned().unwrap_or("show").to_string();
        let args = args.iter().map(|s| s.to_string()).collect::<Vec<_>>();
-        let state = Arc::clone(state);
-        let config = config.clone();

-        async move {
-            let bt_state = {
-                let lock = state.read().await;
-                lock.bluetooth.clone()
-            };
+        let bt_state = state.bluetooth.borrow().clone();

        match action.as_str() {
-                "disconnect" if bt_state.connected => {
-                    let _ = Command::new("bluetoothctl")
-                        .args(["disconnect", &bt_state.device_address])
-                        .output();
+            "connect" => {
+                if let Some(mac) = args.get(1) {
+                    if let Ok(session) = bluer::Session::new().await
+                        && let Ok(adapter) = session.default_adapter().await
+                        && let Ok(addr) = mac.parse::<bluer::Address>()
+                        && let Ok(device) = adapter.device(addr)
+                    {
+                        let _ = device.connect().await;
+                    }
+                    trigger_robust_poll(state.clone());
+                }
                return Ok(WaybarOutput::default());
            }
+            "disconnect" if bt_state.connected => {
+                if let Ok(session) = bluer::Session::new().await
+                    && let Ok(adapter) = session.default_adapter().await
+                    && let Ok(addr) = bt_state.device_address.parse::<bluer::Address>()
+                    && let Ok(device) = adapter.device(addr)
+                {
+                    let _ = device.disconnect().await;
+                }
+                trigger_robust_poll(state.clone());
+                return Ok(WaybarOutput::default());
+            }
+            "menu_data" => {
+                let mut devs = Vec::new();
+                if let Ok(session) = bluer::Session::new().await
+                    && let Ok(adapter) = session.default_adapter().await
+                    && let Ok(addresses) = adapter.device_addresses().await
+                {
+                    for addr in addresses {
+                        if let Ok(device) = adapter.device(addr)
+                            && device.is_paired().await.unwrap_or(false)
+                        {
+                            let alias = device.alias().await.unwrap_or_else(|_| addr.to_string());
+                            devs.push(format!("{} ({})", alias, addr));
+                        }
+                    }
+                }
+                return Ok(WaybarOutput {
+                    text: devs.join("\n"),
+                    ..Default::default()
+                });
+            }
            "cycle_mode" if bt_state.connected => {
                let plugin = PLUGINS
                    .iter()
                    .find(|p| p.can_handle(&bt_state.device_alias, &bt_state.device_address));
                if let Some(p) = plugin {
-                        p.cycle_mode(&bt_state.device_address, &state).await?;
+                    p.cycle_mode(&bt_state.device_address, state).await?;
+                    trigger_robust_poll(state.clone());
                }
                return Ok(WaybarOutput::default());
            }
@@ -141,7 +194,7 @@ impl WaybarModule for BtModule {
                    .iter()
                    .find(|p| p.can_handle(&bt_state.device_alias, &bt_state.device_address));
                let modes = if let Some(p) = plugin {
-                        p.get_modes(&bt_state.device_address, &state).await?
+                    p.get_modes(&bt_state.device_address, state).await?
                } else {
                    vec![]
                };
@@ -152,11 +205,12 @@ impl WaybarModule for BtModule {
            }
            "set_mode" if bt_state.connected => {
                if let Some(mode) = args.get(1) {
-                        let plugin = PLUGINS.iter().find(|p| {
-                            p.can_handle(&bt_state.device_alias, &bt_state.device_address)
-                        });
+                    let plugin = PLUGINS
+                        .iter()
+                        .find(|p| p.can_handle(&bt_state.device_alias, &bt_state.device_address));
                    if let Some(p) = plugin {
-                            p.set_mode(mode, &bt_state.device_address, &state).await?;
+                        p.set_mode(mode, &bt_state.device_address, state).await?;
+                        trigger_robust_poll(state.clone());
                    }
                }
                return Ok(WaybarOutput::default());
@@ -233,4 +287,3 @@ impl WaybarModule for BtModule {
        }
    }
 }
-}
@@ -2,8 +2,8 @@ use crate::config::Config;
 use crate::error::Result;
 use crate::modules::WaybarModule;
 use crate::output::WaybarOutput;
-use crate::state::SharedState;
-use crate::utils::{TokenValue, format_template};
+use crate::state::AppReceivers;
+use crate::utils::{TokenValue, classify_usage, format_template};

 pub struct BtrfsModule;

@@ -11,12 +11,12 @@ impl WaybarModule for BtrfsModule {
    async fn run(
        &self,
        config: &Config,
-        state: &SharedState,
+        state: &AppReceivers,
        _args: &[&str],
    ) -> Result<WaybarOutput> {
        let disks = {
-            let s = state.read().await;
-            s.disks.clone()
+            let s = state.disks.borrow();
+            s.clone()
        };

        let mut total_used: f64 = 0.0;
@@ -44,13 +44,7 @@ impl WaybarModule for BtrfsModule {
        let size_gb = total_size / 1024.0 / 1024.0 / 1024.0;
        let percentage = (total_used / total_size) * 100.0;

-        let class = if percentage > 95.0 {
-            "max"
-        } else if percentage > 80.0 {
-            "high"
-        } else {
-            "normal"
-        };
+        let class = classify_usage(percentage, 80.0, 95.0);

        let text = format_template(
            &config.pool.format,
@@ -2,8 +2,8 @@ use crate::config::Config;
 use crate::error::Result;
 use crate::modules::WaybarModule;
 use crate::output::WaybarOutput;
-use crate::state::SharedState;
-use crate::utils::{TokenValue, format_template};
+use crate::state::AppReceivers;
+use crate::utils::{TokenValue, classify_usage, format_template};

 pub struct CpuModule;

@@ -11,16 +11,12 @@ impl WaybarModule for CpuModule {
    async fn run(
        &self,
        config: &Config,
-        state: &SharedState,
+        state: &AppReceivers,
        _args: &[&str],
    ) -> Result<WaybarOutput> {
        let (usage, temp, model) = {
-            let state_lock = state.read().await;
-            (
-                state_lock.cpu.usage,
-                state_lock.cpu.temp,
-                state_lock.cpu.model.clone(),
-            )
+            let s = state.cpu.borrow();
+            (s.usage, s.temp, s.model.clone())
        };

        let text = format_template(
@@ -31,13 +27,7 @@ impl WaybarModule for CpuModule {
            ],
        );

-        let class = if usage > 95.0 {
-            "max"
-        } else if usage > 75.0 {
-            "high"
-        } else {
-            "normal"
-        };
+        let class = classify_usage(usage, 75.0, 95.0);

        Ok(WaybarOutput {
            text,
@@ -64,7 +54,7 @@ mod tests {
            ..Default::default()
        });
        let config = Config::default();
-        let output = CpuModule.run(&config, &state, &[]).await.unwrap();
+        let output = CpuModule.run(&config, &state.receivers, &[]).await.unwrap();
        assert!(output.text.contains("25.0"));
        assert!(output.text.contains("45.0"));
        assert_eq!(output.class.as_deref(), Some("normal"));
@@ -83,7 +73,7 @@ mod tests {
            ..Default::default()
        });
        let config = Config::default();
-        let output = CpuModule.run(&config, &state, &[]).await.unwrap();
+        let output = CpuModule.run(&config, &state.receivers, &[]).await.unwrap();
        assert_eq!(output.class.as_deref(), Some("high"));
    }

@@ -98,7 +88,7 @@ mod tests {
            ..Default::default()
        });
        let config = Config::default();
-        let output = CpuModule.run(&config, &state, &[]).await.unwrap();
+        let output = CpuModule.run(&config, &state.receivers, &[]).await.unwrap();
        assert_eq!(output.class.as_deref(), Some("max"));
    }
 }
@@ -2,8 +2,8 @@ use crate::config::Config;
 use crate::error::{FluxoError, Result};
 use crate::modules::WaybarModule;
 use crate::output::WaybarOutput;
-use crate::state::SharedState;
-use crate::utils::{TokenValue, format_template};
+use crate::state::AppReceivers;
+use crate::utils::{TokenValue, classify_usage, format_template};

 pub struct DiskModule;

@@ -11,15 +11,19 @@ impl WaybarModule for DiskModule {
    async fn run(
        &self,
        config: &Config,
-        state: &SharedState,
+        state: &AppReceivers,
        args: &[&str],
    ) -> Result<WaybarOutput> {
        let mountpoint = args.first().unwrap_or(&"/");

-        let disks = {
-            let s = state.read().await;
-            s.disks.clone()
-        };
+        let disks = state.disks.borrow().clone();
+
+        if disks.is_empty() {
+            return Ok(WaybarOutput {
+                text: "Disk Loading...".to_string(),
+                ..Default::default()
+            });
+        }

        for disk in &disks {
            if disk.mount_point == *mountpoint {
@@ -37,13 +41,7 @@ impl WaybarModule for DiskModule {
                    0.0
                };

-                let class = if percentage > 95.0 {
-                    "max"
-                } else if percentage > 80.0 {
-                    "high"
-                } else {
-                    "normal"
-                };
+                let class = classify_usage(percentage, 80.0, 95.0);

                let text = format_template(
                    &config.disk.format,
@@ -76,9 +74,9 @@ impl WaybarModule for DiskModule {
 #[cfg(test)]
 mod tests {
    use super::*;
-    use crate::state::{AppState, DiskInfo, mock_state};
+    use crate::state::{AppState, DiskInfo, MockState, mock_state};

-    fn state_with_disk(mount: &str, total: u64, available: u64) -> crate::state::SharedState {
+    fn state_with_disk(mount: &str, total: u64, available: u64) -> MockState {
        mock_state(AppState {
            disks: vec![DiskInfo {
                mount_point: mount.to_string(),
@@ -95,7 +93,10 @@ mod tests {
        let gb = 1024 * 1024 * 1024;
        let state = state_with_disk("/", 100 * gb, 60 * gb);
        let config = Config::default();
-        let output = DiskModule.run(&config, &state, &["/"]).await.unwrap();
+        let output = DiskModule
+            .run(&config, &state.receivers, &["/"])
+            .await
+            .unwrap();
        assert_eq!(output.class.as_deref(), Some("normal"));
        assert_eq!(output.percentage, Some(40)); // 40% used
    }
@@ -105,15 +106,20 @@ mod tests {
        let gb = 1024 * 1024 * 1024;
        let state = state_with_disk("/", 100 * gb, 15 * gb);
        let config = Config::default();
-        let output = DiskModule.run(&config, &state, &["/"]).await.unwrap();
+        let output = DiskModule
+            .run(&config, &state.receivers, &["/"])
+            .await
+            .unwrap();
        assert_eq!(output.class.as_deref(), Some("high")); // 85% used
    }

    #[tokio::test]
    async fn test_disk_not_found() {
-        let state = mock_state(AppState::default());
+        let state = state_with_disk("/", 100, 50);
        let config = Config::default();
-        let result = DiskModule.run(&config, &state, &["/nonexistent"]).await;
+        let result = DiskModule
+            .run(&config, &state.receivers, &["/nonexistent"])
+            .await;
        assert!(result.is_err());
    }
 }
@@ -0,0 +1,174 @@
+use crate::config::Config;
+use crate::error::Result;
+use crate::modules::WaybarModule;
+use crate::output::WaybarOutput;
+use crate::state::{AppReceivers, DndState};
+use futures::StreamExt;
+use tokio::sync::watch;
+use tracing::{debug, error, info};
+use zbus::{Connection, fdo::PropertiesProxy, proxy};
+
+pub struct DndModule;
+
+impl WaybarModule for DndModule {
+    async fn run(
+        &self,
+        config: &Config,
+        state: &AppReceivers,
+        args: &[&str],
+    ) -> Result<WaybarOutput> {
+        let action = args.first().unwrap_or(&"show");
+
+        if *action == "toggle" {
+            let connection =
+                Connection::session()
+                    .await
+                    .map_err(|e| crate::error::FluxoError::Module {
+                        module: "dnd",
+                        message: format!("DBus connection failed: {}", e),
+                    })?;
+
+            // Try toggling SwayNC
+            if let Ok(proxy) = SwayncControlProxy::new(&connection).await
+                && let Ok(is_dnd) = proxy.dnd().await
+            {
+                let _ = proxy.set_dnd(!is_dnd).await;
+                return Ok(WaybarOutput::default());
+            }
+
+            // Try toggling Dunst
+            if let Ok(proxy) = DunstControlProxy::new(&connection).await
+                && let Ok(is_paused) = proxy.paused().await
+            {
+                let _ = proxy.set_paused(!is_paused).await;
+                return Ok(WaybarOutput::default());
+            }
+
+            return Err(crate::error::FluxoError::Module {
+                module: "dnd",
+                message: "No supported notification daemon found to toggle".to_string(),
+            });
+        }
+
+        let is_dnd = state.dnd.borrow().is_dnd;
+
+        if is_dnd {
+            Ok(WaybarOutput {
+                text: config.dnd.format_dnd.clone(),
+                tooltip: Some("Do Not Disturb: On".to_string()),
+                class: Some("dnd".to_string()),
+                percentage: None,
+            })
+        } else {
+            Ok(WaybarOutput {
+                text: config.dnd.format_normal.clone(),
+                tooltip: Some("Do Not Disturb: Off".to_string()),
+                class: Some("normal".to_string()),
+                percentage: None,
+            })
+        }
+    }
+}
+
+pub struct DndDaemon;
+
+#[proxy(
+    interface = "org.erikreider.swaync.control",
+    default_service = "org.erikreider.swaync.control",
+    default_path = "/org/erikreider/swaync/control"
+)]
+trait SwayncControl {
+    #[zbus(property)]
+    fn dnd(&self) -> zbus::Result<bool>;
+    #[zbus(property)]
+    fn set_dnd(&self, value: bool) -> zbus::Result<()>;
+}
+
+#[proxy(
+    interface = "org.dunstproject.cmd0",
+    default_service = "org.freedesktop.Notifications",
+    default_path = "/org/freedesktop/Notifications"
+)]
+trait DunstControl {
+    #[zbus(property)]
+    fn paused(&self) -> zbus::Result<bool>;
+    #[zbus(property)]
+    fn set_paused(&self, value: bool) -> zbus::Result<()>;
+}
+
+impl DndDaemon {
+    pub fn new() -> Self {
+        Self
+    }
+
+    pub fn start(&self, tx: watch::Sender<DndState>) {
+        tokio::spawn(async move {
+            loop {
+                if let Err(e) = Self::listen_loop(&tx).await {
+                    error!("DND listener error: {}", e);
+                    tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
+                }
+            }
+        });
+    }
+
+    async fn listen_loop(tx: &watch::Sender<DndState>) -> anyhow::Result<()> {
+        let connection = Connection::session().await?;
+
+        info!("Connected to D-Bus for DND monitoring");
+
+        // Try SwayNC
+        if let Ok(proxy) = SwayncControlProxy::new(&connection).await
+            && let Ok(is_dnd) = proxy.dnd().await
+        {
+            debug!("Found SwayNC, using it for DND state.");
+            let _ = tx.send(DndState { is_dnd });
+
+            if let Ok(props_proxy) = PropertiesProxy::builder(&connection)
+                .destination("org.erikreider.swaync.control")?
+                .path("/org/erikreider/swaync/control")?
+                .build()
+                .await
+            {
+                let mut stream = props_proxy.receive_properties_changed().await?;
+                while let Some(signal) = stream.next().await {
+                    let args = signal.args()?;
+                    if args.interface_name == "org.erikreider.swaync.control"
+                        && let Some(val) = args.changed_properties.get("dnd")
+                        && let Ok(is_dnd) = bool::try_from(val)
+                    {
+                        let _ = tx.send(DndState { is_dnd });
+                    }
+                }
+            }
+        }
+
+        // Try Dunst
+        if let Ok(proxy) = DunstControlProxy::new(&connection).await
+            && let Ok(is_dnd) = proxy.paused().await
+        {
+            debug!("Found Dunst, using it for DND state.");
+            let _ = tx.send(DndState { is_dnd });
+
+            if let Ok(props_proxy) = PropertiesProxy::builder(&connection)
+                .destination("org.freedesktop.Notifications")?
+                .path("/org/freedesktop/Notifications")?
+                .build()
+                .await
+            {
+                let mut stream = props_proxy.receive_properties_changed().await?;
+                while let Some(signal) = stream.next().await {
+                    let args = signal.args()?;
+                    if args.interface_name == "org.dunstproject.cmd0"
+                        && let Some(val) = args.changed_properties.get("paused")
+                        && let Ok(is_dnd) = bool::try_from(val)
+                    {
+                        let _ = tx.send(DndState { is_dnd });
+                    }
+                }
+            }
+        }
+
+        Err(anyhow::anyhow!("DND stream ended or daemon not found"))
+    }
+}
@@ -2,11 +2,9 @@ use crate::config::Config;
 use crate::error::Result;
 use crate::modules::WaybarModule;
 use crate::output::WaybarOutput;
-use crate::state::SharedState;
-use anyhow::anyhow;
-use std::env;
-use std::io::{Read, Write};
-use std::os::unix::net::UnixStream;
+use crate::state::AppReceivers;
+use tokio::io::{AsyncReadExt, AsyncWriteExt};
+use tokio::net::UnixStream;

 pub struct GameModule;

@@ -14,10 +12,11 @@ impl WaybarModule for GameModule {
    async fn run(
        &self,
        config: &Config,
-        _state: &SharedState,
+        _state: &AppReceivers,
        _args: &[&str],
    ) -> Result<WaybarOutput> {
        let is_gamemode = hyprland_ipc("j/getoption animations:enabled")
+            .await
            .map(|stdout| stdout.contains("\"int\": 0"))
            .unwrap_or(false);

@@ -39,16 +38,14 @@ impl WaybarModule for GameModule {
    }
 }

-fn hyprland_ipc(cmd: &str) -> Result<String> {
-    let signature = env::var("HYPRLAND_INSTANCE_SIGNATURE")
-        .map_err(|_| anyhow!("HYPRLAND_INSTANCE_SIGNATURE not set"))?;
-    let path = format!("/tmp/hypr/{}/.socket.sock", signature);
+async fn hyprland_ipc(cmd: &str) -> Result<String> {
+    let path = crate::utils::get_hyprland_socket(".socket.sock")?;

-    let mut stream = UnixStream::connect(path)?;
-    stream.write_all(cmd.as_bytes())?;
+    let mut stream = UnixStream::connect(path).await?;
+    stream.write_all(cmd.as_bytes()).await?;

    let mut response = String::new();
-    stream.read_to_string(&mut response)?;
+    stream.read_to_string(&mut response).await?;

    Ok(response)
 }
@@ -2,8 +2,8 @@ use crate::config::Config;
 use crate::error::Result;
 use crate::modules::WaybarModule;
 use crate::output::WaybarOutput;
-use crate::state::SharedState;
-use crate::utils::{TokenValue, format_template};
+use crate::state::AppReceivers;
+use crate::utils::{TokenValue, classify_usage, format_template};

 pub struct GpuModule;

@@ -11,19 +11,19 @@ impl WaybarModule for GpuModule {
    async fn run(
        &self,
        config: &Config,
-        state: &SharedState,
+        state: &AppReceivers,
        _args: &[&str],
    ) -> Result<WaybarOutput> {
        let (active, vendor, usage, vram_used, vram_total, temp, model) = {
-            let state_lock = state.read().await;
+            let s = state.gpu.borrow();
            (
-                state_lock.gpu.active,
-                state_lock.gpu.vendor.clone(),
-                state_lock.gpu.usage,
-                state_lock.gpu.vram_used,
-                state_lock.gpu.vram_total,
-                state_lock.gpu.temp,
-                state_lock.gpu.model.clone(),
+                s.active,
+                s.vendor.clone(),
+                s.usage,
+                s.vram_used,
+                s.vram_total,
+                s.temp,
+                s.model.clone(),
            )
        };

@@ -36,13 +36,7 @@ impl WaybarModule for GpuModule {
            });
        }

-        let class = if usage > 95.0 {
-            "max"
-        } else if usage > 75.0 {
-            "high"
-        } else {
-            "normal"
-        };
+        let class = classify_usage(usage, 75.0, 95.0);

        let format_str = match vendor.as_str() {
            "Intel" => &config.gpu.format_intel,
@@ -1,5 +1,6 @@
-use crate::state::{DiskInfo, SharedState};
+use crate::state::{CpuState, DiskInfo, GpuState, MemoryState, SysState};
 use sysinfo::{Components, Disks, System};
+use tokio::sync::watch;

 pub struct HardwareDaemon {
    sys: System,
@@ -24,7 +25,12 @@ impl HardwareDaemon {
        }
    }

-    pub async fn poll_fast(&mut self, state: SharedState) {
+    pub async fn poll_fast(
+        &mut self,
+        cpu_tx: &watch::Sender<CpuState>,
+        mem_tx: &watch::Sender<MemoryState>,
+        sys_tx: &watch::Sender<SysState>,
+    ) {
        self.sys.refresh_cpu_usage();
        self.sys.refresh_memory();
        self.components.refresh(true);
@@ -70,28 +76,37 @@ impl HardwareDaemon {
            }
        }

-        let mut state_lock = state.write().await;
-        state_lock.cpu.usage = cpu_usage as f64;
-        state_lock.cpu.temp = cpu_temp;
-        state_lock.cpu.model = cpu_model;
+        let mut cpu = cpu_tx.borrow().clone();
+        cpu.usage = cpu_usage as f64;
+        cpu.temp = cpu_temp;
+        cpu.model = cpu_model;
+        let _ = cpu_tx.send(cpu);

-        state_lock.memory.total_gb = total_mem;
-        state_lock.memory.used_gb = used_mem;
+        let mut mem = mem_tx.borrow().clone();
+        mem.total_gb = total_mem;
+        mem.used_gb = used_mem;
+        let _ = mem_tx.send(mem);

-        state_lock.sys.load_1 = load_avg.one;
-        state_lock.sys.load_5 = load_avg.five;
-        state_lock.sys.load_15 = load_avg.fifteen;
-        state_lock.sys.uptime = uptime;
-        state_lock.sys.process_count = process_count;
+        let mut sys = sys_tx.borrow().clone();
+        sys.load_1 = load_avg.one;
+        sys.load_5 = load_avg.five;
+        sys.load_15 = load_avg.fifteen;
+        sys.uptime = uptime;
+        sys.process_count = process_count;
+        let _ = sys_tx.send(sys);
    }

-    pub async fn poll_slow(&mut self, state: SharedState) {
+    pub async fn poll_slow(
+        &mut self,
+        gpu_tx: &watch::Sender<GpuState>,
+        disks_tx: &watch::Sender<Vec<DiskInfo>>,
+    ) {
        // 1. Gather GPU data outside of lock
        let mut gpu_state = crate::state::GpuState::default();
        self.gpu_poll_counter = (self.gpu_poll_counter + 1) % 5;
        let should_poll_gpu = self.gpu_poll_counter == 0;
        if should_poll_gpu {
-            self.poll_gpu(&mut gpu_state);
+            self.poll_gpu(&mut gpu_state).await;
        }

        // 2. Gather Disk data outside of lock
@@ -99,6 +114,7 @@ impl HardwareDaemon {
        self.disk_poll_counter = (self.disk_poll_counter + 1) % 10;
        if self.disk_poll_counter == 0 {
            disks_data = Some(
+                tokio::task::spawn_blocking(|| {
                    Disks::new_with_refreshed_list()
                        .iter()
                        .map(|d| DiskInfo {
@@ -107,31 +123,34 @@ impl HardwareDaemon {
                            total_bytes: d.total_space(),
                            available_bytes: d.available_space(),
                        })
-                    .collect::<Vec<DiskInfo>>(),
+                        .collect::<Vec<DiskInfo>>()
+                })
+                .await
+                .unwrap_or_default(),
            );
        }

        // 3. Apply to state
-        let mut state_lock = state.write().await;
        if should_poll_gpu {
-            state_lock.gpu = gpu_state;
+            let _ = gpu_tx.send(gpu_state);
        }

        if let Some(d) = disks_data {
-            state_lock.disks = d;
+            let _ = disks_tx.send(d);
        }
    }

-    fn poll_gpu(&mut self, gpu: &mut crate::state::GpuState) {
+    async fn poll_gpu(&mut self, gpu: &mut crate::state::GpuState) {
        gpu.active = false;

        if (self.gpu_vendor.as_deref() == Some("NVIDIA") || self.gpu_vendor.is_none())
-            && let Ok(output) = std::process::Command::new("nvidia-smi")
+            && let Ok(output) = tokio::process::Command::new("nvidia-smi")
                .args([
                    "--query-gpu=utilization.gpu,memory.used,memory.total,temperature.gpu,name",
                    "--format=csv,noheader,nounits",
                ])
                .output()
+                .await
            && output.status.success()
        {
            let stdout = String::from_utf8_lossy(&output.stdout);
@@ -0,0 +1,104 @@
+use crate::config::Config;
+use crate::error::Result;
+use crate::modules::WaybarModule;
+use crate::output::WaybarOutput;
+use crate::state::{AppReceivers, KeyboardState};
+use crate::utils::{TokenValue, format_template};
+use anyhow::anyhow;
+use tokio::io::{AsyncBufReadExt, BufReader};
+use tokio::net::UnixStream;
+use tokio::sync::watch;
+use tracing::{error, info};
+
+pub struct KeyboardModule;
+
+impl WaybarModule for KeyboardModule {
+    async fn run(
+        &self,
+        config: &Config,
+        state: &AppReceivers,
+        _args: &[&str],
+    ) -> Result<WaybarOutput> {
+        let layout = state.keyboard.borrow().layout.clone();
+
+        if layout.is_empty() {
+            return Ok(WaybarOutput {
+                text: "Layout Loading...".to_string(),
+                tooltip: None,
+                class: Some("loading".to_string()),
+                percentage: None,
+            });
+        }
+
+        let text = format_template(
+            &config.keyboard.format,
+            &[("layout", TokenValue::String(layout.clone()))],
+        );
+
+        Ok(WaybarOutput {
+            text,
+            tooltip: Some(format!("Keyboard Layout: {}", layout)),
+            class: Some("normal".to_string()),
+            percentage: None,
+        })
+    }
+}
+
+pub struct KeyboardDaemon;
+
+impl KeyboardDaemon {
+    pub fn new() -> Self {
+        Self
+    }
+
+    pub fn start(&self, tx: watch::Sender<KeyboardState>) {
+        tokio::spawn(async move {
+            loop {
+                if let Err(e) = Self::listen_loop(&tx).await {
+                    error!("Keyboard layout listener error: {}", e);
+                    // Fallback to waiting before reconnecting to prevent tight loop
+                    tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
+                }
+            }
+        });
+    }
+
+    async fn listen_loop(tx: &watch::Sender<KeyboardState>) -> anyhow::Result<()> {
+        let path = crate::utils::get_hyprland_socket(".socket2.sock")?;
+
+        info!("Connecting to Hyprland event socket: {:?}", path);
+        let stream = UnixStream::connect(path).await?;
+        let reader = BufReader::new(stream);
+        let mut lines = reader.lines();
+
+        // Fetch initial layout natively via hyprctl
+        if let Ok(output) = tokio::process::Command::new("hyprctl")
+            .args(["devices", "-j"])
+            .output()
+            .await
+            && let Ok(json) = serde_json::from_slice::<serde_json::Value>(&output.stdout)
+            && let Some(keyboards) = json.get("keyboards").and_then(|v| v.as_array())
+            && let Some(main_kb) = keyboards.last()
+        {
+            // The last active one is usually the main one
+            if let Some(layout) = main_kb.get("active_keymap").and_then(|v| v.as_str()) {
+                let _ = tx.send(KeyboardState {
+                    layout: layout.to_string(),
+                });
+            }
+        }
+
+        while let Ok(Some(line)) = lines.next_line().await {
+            if let Some(payload) = line.strip_prefix("activelayout>>") {
+                // payload format: keyboard_name,layout_name
+                let parts: Vec<&str> = payload.splitn(2, ',').collect();
+                if parts.len() == 2 {
+                    let layout = parts[1].to_string();
+                    let _ = tx.send(KeyboardState { layout });
+                }
+            }
+        }
+
+        Err(anyhow!("Hyprland socket closed or read error"))
+    }
+}
@@ -2,8 +2,8 @@ use crate::config::Config;
 use crate::error::Result;
 use crate::modules::WaybarModule;
 use crate::output::WaybarOutput;
-use crate::state::SharedState;
-use crate::utils::{TokenValue, format_template};
+use crate::state::AppReceivers;
+use crate::utils::{TokenValue, classify_usage, format_template};

 pub struct MemoryModule;

@@ -11,12 +11,12 @@ impl WaybarModule for MemoryModule {
    async fn run(
        &self,
        config: &Config,
-        state: &SharedState,
+        state: &AppReceivers,
        _args: &[&str],
    ) -> Result<WaybarOutput> {
        let (used_gb, total_gb) = {
-            let state_lock = state.read().await;
-            (state_lock.memory.used_gb, state_lock.memory.total_gb)
+            let s = state.memory.borrow();
+            (s.used_gb, s.total_gb)
        };

        let ratio = if total_gb > 0.0 {
@@ -33,13 +33,7 @@ impl WaybarModule for MemoryModule {
            ],
        );

-        let class = if ratio > 95.0 {
-            "max"
-        } else if ratio > 75.0 {
-            "high"
-        } else {
-            "normal"
-        };
+        let class = classify_usage(ratio, 75.0, 95.0);

        Ok(WaybarOutput {
            text,
@@ -65,7 +59,10 @@ mod tests {
            ..Default::default()
        });
        let config = Config::default();
-        let output = MemoryModule.run(&config, &state, &[]).await.unwrap();
+        let output = MemoryModule
+            .run(&config, &state.receivers, &[])
+            .await
+            .unwrap();
        assert!(output.text.contains("8.00"));
        assert!(output.text.contains("32.00"));
        assert_eq!(output.class.as_deref(), Some("normal"));
@@ -82,7 +79,10 @@ mod tests {
            ..Default::default()
        });
        let config = Config::default();
-        let output = MemoryModule.run(&config, &state, &[]).await.unwrap();
+        let output = MemoryModule
+            .run(&config, &state.receivers, &[])
+            .await
+            .unwrap();
        assert_eq!(output.class.as_deref(), Some("high")); // 81%
    }

@@ -96,7 +96,10 @@ mod tests {
            ..Default::default()
        });
        let config = Config::default();
-        let output = MemoryModule.run(&config, &state, &[]).await.unwrap();
+        let output = MemoryModule
+            .run(&config, &state.receivers, &[])
+            .await
+            .unwrap();
        assert_eq!(output.class.as_deref(), Some("normal"));
        assert_eq!(output.percentage, Some(0));
    }
@@ -1,26 +1,46 @@
+#[cfg(feature = "mod-audio")]
 pub mod audio;
+#[cfg(feature = "mod-dbus")]
+pub mod backlight;
+#[cfg(feature = "mod-bt")]
 pub mod bt;
+#[cfg(feature = "mod-hardware")]
 pub mod btrfs;
+#[cfg(feature = "mod-hardware")]
 pub mod cpu;
+#[cfg(feature = "mod-hardware")]
 pub mod disk;
+#[cfg(feature = "mod-dbus")]
+pub mod dnd;
+#[cfg(feature = "mod-hardware")]
 pub mod game;
+#[cfg(feature = "mod-hardware")]
 pub mod gpu;
+#[cfg(feature = "mod-hardware")]
 pub mod hardware;
+#[cfg(feature = "mod-dbus")]
+pub mod keyboard;
+#[cfg(feature = "mod-hardware")]
 pub mod memory;
+#[cfg(feature = "mod-dbus")]
+pub mod mpris;
+#[cfg(feature = "mod-network")]
 pub mod network;
+#[cfg(feature = "mod-hardware")]
 pub mod power;
+#[cfg(feature = "mod-hardware")]
 pub mod sys;

 use crate::config::Config;
 use crate::error::Result as FluxoResult;
 use crate::output::WaybarOutput;
-use crate::state::SharedState;
+use crate::state::AppReceivers;

 pub trait WaybarModule {
    fn run(
        &self,
        config: &Config,
-        state: &SharedState,
+        state: &AppReceivers,
        args: &[&str],
    ) -> impl std::future::Future<Output = FluxoResult<WaybarOutput>> + Send;
 }
@@ -0,0 +1,207 @@
+use crate::config::Config;
+use crate::error::Result;
+use crate::modules::WaybarModule;
+use crate::output::WaybarOutput;
+use crate::state::{AppReceivers, MprisState};
+use crate::utils::{TokenValue, format_template};
+use tokio::sync::watch;
+use tracing::{debug, info};
+use zbus::{Connection, proxy};
+
+pub struct MprisModule;
+
+impl WaybarModule for MprisModule {
+    async fn run(
+        &self,
+        config: &Config,
+        state: &AppReceivers,
+        _args: &[&str],
+    ) -> Result<WaybarOutput> {
+        let mpris = state.mpris.borrow().clone();
+
+        if mpris.is_stopped && mpris.title.is_empty() {
+            return Ok(WaybarOutput {
+                text: String::new(),
+                tooltip: None,
+                class: Some("stopped".to_string()),
+                percentage: None,
+            });
+        }
+
+        let status_icon = if mpris.is_playing {
+            "󰏤"
+        } else if mpris.is_paused {
+            "󰐊"
+        } else {
+            "󰓛"
+        };
+
+        let class = if mpris.is_playing {
+            "playing"
+        } else if mpris.is_paused {
+            "paused"
+        } else {
+            "stopped"
+        };
+
+        let text = format_template(
+            &config.mpris.format,
+            &[
+                ("artist", TokenValue::String(mpris.artist.clone())),
+                ("title", TokenValue::String(mpris.title.clone())),
+                ("album", TokenValue::String(mpris.album.clone())),
+                ("status_icon", TokenValue::String(status_icon.to_string())),
+            ],
+        );
+
+        Ok(WaybarOutput {
+            text,
+            tooltip: Some(format!("{} - {}", mpris.artist, mpris.title)),
+            class: Some(class.to_string()),
+            percentage: None,
+        })
+    }
+}
+
+pub struct MprisDaemon;
+
+#[proxy(
+    interface = "org.freedesktop.DBus",
+    default_service = "org.freedesktop.DBus",
+    default_path = "/org/freedesktop/DBus"
+)]
+trait DBus {
+    fn list_names(&self) -> zbus::Result<Vec<String>>;
+}
+
+#[proxy(
+    interface = "org.mpris.MediaPlayer2.Player",
+    default_path = "/org/mpris/MediaPlayer2"
+)]
+trait MprisPlayer {
+    #[zbus(property)]
+    fn playback_status(&self) -> zbus::Result<String>;
+
+    #[zbus(property)]
+    fn metadata(
+        &self,
+    ) -> zbus::Result<std::collections::HashMap<String, zbus::zvariant::Value<'_>>>;
+}
+
+impl MprisDaemon {
+    pub fn new() -> Self {
+        Self
+    }
+
+    pub fn start(&self, tx: watch::Sender<MprisState>) {
+        tokio::spawn(async move {
+            loop {
+                if let Err(e) = Self::listen_loop(&tx).await {
+                    debug!("MPRIS listener ended or error: {}", e);
+                    tokio::time::sleep(tokio::time::Duration::from_secs(5)).await;
+                }
+            }
+        });
+    }
+
+    async fn listen_loop(tx: &watch::Sender<MprisState>) -> anyhow::Result<()> {
+        let connection = Connection::session().await?;
+
+        info!("Connected to D-Bus for MPRIS monitoring");
+
+        // Periodically poll for the active player and update the MPRIS state.
+        // This avoids complex dynamic signal tracking across ephemeral player instances.
+
+        let dbus_proxy = DBusProxy::new(&connection).await?;
+
+        loop {
+            let names = dbus_proxy.list_names().await?;
+            let mut active_player = None;
+
+            for name in names {
+                if name.starts_with("org.mpris.MediaPlayer2.") {
+                    active_player = Some(name);
+                    break; // Just grab the first active player for now
+                }
+            }
+
+            if let Some(player_name) = active_player {
+                if let Ok(player_proxy) = MprisPlayerProxy::builder(&connection)
+                    .destination(player_name.clone())?
+                    .build()
+                    .await
+                {
+                    let status = player_proxy.playback_status().await.unwrap_or_default();
+                    let metadata = player_proxy.metadata().await.unwrap_or_default();
+
+                    let is_playing = status == "Playing";
+                    let is_paused = status == "Paused";
+                    let is_stopped = status == "Stopped";
+
+                    let mut artist = String::new();
+                    let mut title = String::new();
+                    let mut album = String::new();
+
+                    if let Some(v) = metadata.get("xesam:artist") {
+                        if let Ok(arr) = zbus::zvariant::Array::try_from(v) {
+                            let mut artists = Vec::new();
+                            for i in 0..arr.len() {
+                                if let Ok(Some(s)) = arr.get::<&str>(i) {
+                                    artists.push(s.to_string());
+                                }
+                            }
+                            artist = artists.join(", ");
+                        } else if let Ok(a) = <&str>::try_from(v) {
+                            artist = a.to_string();
+                        }
+                    }
+                    if let Some(v) = metadata.get("xesam:title")
+                        && let Ok(t) = <&str>::try_from(v)
+                    {
+                        title = t.to_string();
+                    }
+                    if let Some(v) = metadata.get("xesam:album")
+                        && let Ok(a) = <&str>::try_from(v)
+                    {
+                        album = a.to_string();
+                    }
+
+                    // Only send if changed
+                    let current = tx.borrow();
+                    if current.is_playing != is_playing
+                        || current.is_paused != is_paused
+                        || current.is_stopped != is_stopped
+                        || current.title != title
+                        || current.artist != artist
+                        || current.album != album
+                    {
+                        drop(current); // Drop borrow before send
+                        let _ = tx.send(MprisState {
+                            is_playing,
+                            is_paused,
+                            is_stopped,
+                            artist,
+                            title,
+                            album,
+                        });
+                    }
+                }
+            } else {
+                let current = tx.borrow();
+                if !current.is_stopped || !current.title.is_empty() {
+                    drop(current);
+                    let _ = tx.send(MprisState {
+                        is_playing: false,
+                        is_paused: false,
+                        is_stopped: true,
+                        artist: String::new(),
+                        title: String::new(),
+                        album: String::new(),
+                    });
+                }
+            }
+
+            tokio::time::sleep(tokio::time::Duration::from_secs(2)).await;
+        }
+    }
+}
@@ -2,11 +2,12 @@ use crate::config::Config;
 use crate::error::Result;
 use crate::modules::WaybarModule;
 use crate::output::WaybarOutput;
-use crate::state::SharedState;
+use crate::state::{AppReceivers, NetworkState};
 use crate::utils::{TokenValue, format_template};
 use nix::ifaddrs::getifaddrs;
 use std::fs;
 use std::time::{SystemTime, UNIX_EPOCH};
+use tokio::sync::watch;

 pub struct NetworkModule;

@@ -18,6 +19,8 @@ pub struct NetworkDaemon {
    cached_ip: Option<String>,
 }

+type PollResult = crate::error::Result<(String, Option<String>, Option<(u64, u64)>)>;
+
 impl NetworkDaemon {
    pub fn new() -> Self {
        Self {
@@ -29,28 +32,63 @@ impl NetworkDaemon {
        }
    }

-    pub async fn poll(&mut self, state: SharedState) {
-        // Re-detect interface on every poll to catch VPNs or route changes immediately
-        if let Ok(iface) = get_primary_interface()
-            && !iface.is_empty()
-        {
-            // If the interface changed, or we don't have an IP yet, update the IP
+    pub async fn poll(
+        &mut self,
+        state_tx: &watch::Sender<NetworkState>,
+    ) -> crate::error::Result<()> {
+        let (iface, ip_opt, bytes_opt) = tokio::task::spawn_blocking(|| -> PollResult {
+            let iface = get_primary_interface()?;
+            if iface.is_empty() {
+                return Ok((String::new(), None, None));
+            }
+            let ip = get_ip_address(&iface);
+            let bytes = get_bytes(&iface).ok();
+            Ok((iface, ip, bytes))
+        })
+        .await
+        .map_err(|e| crate::error::FluxoError::System(e.to_string()))??;
+
+        if !iface.is_empty() {
            if self.cached_interface.as_ref() != Some(&iface) || self.cached_ip.is_none() {
-                self.cached_ip = get_ip_address(&iface);
-                self.cached_interface = Some(iface);
+                self.cached_ip = ip_opt;
+                self.cached_interface = Some(iface.clone());
            }
        } else {
            self.cached_interface = None;
            self.cached_ip = None;
+            // Provide a default state for "No connection"
+            let mut network = state_tx.borrow().clone();
+            network.interface.clear();
+            network.ip.clear();
+            network.rx_mbps = 0.0;
+            network.tx_mbps = 0.0;
+            let _ = state_tx.send(network);
+            return Err(crate::error::FluxoError::Network(
+                "No primary interface found".into(),
+            ));
        }

-        if let Some(ref interface) = self.cached_interface {
+        let interface = if let Some(ref interface) = self.cached_interface {
+            interface.clone()
+        } else {
+            // No interface detected
+            let mut network = state_tx.borrow().clone();
+            network.interface.clear();
+            network.ip.clear();
+            network.rx_mbps = 0.0;
+            network.tx_mbps = 0.0;
+            let _ = state_tx.send(network);
+            return Err(crate::error::FluxoError::Network(
+                "Interface disappeared during poll".into(),
+            ));
+        };
+
        let time_now = SystemTime::now()
            .duration_since(UNIX_EPOCH)
            .unwrap_or_default()
            .as_secs();

-            if let Ok((rx_bytes_now, tx_bytes_now)) = get_bytes(interface) {
+        if let Some((rx_bytes_now, tx_bytes_now)) = bytes_opt {
            if self.last_time > 0 && time_now > self.last_time {
                let time_diff = (time_now - self.last_time) as f64;
                let rx_mbps = (rx_bytes_now.saturating_sub(self.last_rx_bytes)) as f64
@@ -62,16 +100,18 @@ impl NetworkDaemon {
                    / 1024.0
                    / 1024.0;

-                    let mut state_lock = state.write().await;
-                    state_lock.network.rx_mbps = rx_mbps;
-                    state_lock.network.tx_mbps = tx_mbps;
-                    state_lock.network.interface = interface.clone();
-                    state_lock.network.ip = self.cached_ip.clone().unwrap_or_default();
+                let mut network = state_tx.borrow().clone();
+                network.rx_mbps = rx_mbps;
+                network.tx_mbps = tx_mbps;
+                network.interface = interface.clone();
+                network.ip = self.cached_ip.clone().unwrap_or_default();
+                let _ = state_tx.send(network);
            } else {
                // First poll: no speed data yet, but update interface/ip
-                    let mut state_lock = state.write().await;
-                    state_lock.network.interface = interface.clone();
-                    state_lock.network.ip = self.cached_ip.clone().unwrap_or_default();
+                let mut network = state_tx.borrow().clone();
+                network.interface = interface.clone();
+                network.ip = self.cached_ip.clone().unwrap_or_default();
+                let _ = state_tx.send(network);
            }

            self.last_time = time_now;
@@ -80,13 +120,13 @@ impl NetworkDaemon {
        } else {
            // Read failed, might be down
            self.cached_interface = None;
+            return Err(crate::error::FluxoError::Network(format!(
+                "Failed to read bytes for {}",
+                interface
+            )));
        }
-        } else {
-            // No interface detected
-            let mut state_lock = state.write().await;
-            state_lock.network.interface.clear();
-            state_lock.network.ip.clear();
-        }
+
+        Ok(())
    }
 }

@@ -94,17 +134,12 @@ impl WaybarModule for NetworkModule {
    async fn run(
        &self,
        config: &Config,
-        state: &SharedState,
+        state: &AppReceivers,
        _args: &[&str],
    ) -> Result<WaybarOutput> {
        let (interface, ip, rx_mbps, tx_mbps) = {
-            let s = state.read().await;
-            (
-                s.network.interface.clone(),
-                s.network.ip.clone(),
-                s.network.rx_mbps,
-                s.network.tx_mbps,
-            )
+            let s = state.network.borrow();
+            (s.interface.clone(), s.ip.clone(), s.rx_mbps, s.tx_mbps)
        };

        if interface.is_empty() {
@@ -148,24 +183,26 @@ impl WaybarModule for NetworkModule {
 }

 fn get_primary_interface() -> Result<String> {
-    let content = fs::read_to_string("/proc/net/route")?;
+    let content = std::fs::read_to_string("/proc/net/route")?;

    let mut defaults = Vec::new();
    for line in content.lines().skip(1) {
        let parts: Vec<&str> = line.split_whitespace().collect();
-        if parts.len() >= 7 {
+        if parts.len() >= 8 {
            let iface = parts[0];
            let dest = parts[1];
            let metric = parts[6].parse::<i32>().unwrap_or(0);
+            let mask = u32::from_str_radix(parts[7], 16).unwrap_or(0);

            if dest == "00000000" {
-                defaults.push((metric, iface.to_string()));
+                defaults.push((mask, metric, iface.to_string()));
            }
        }
    }

-    defaults.sort_by_key(|k| k.0);
-    if let Some((_, dev)) = defaults.first() {
+    // Sort by mask descending (longest prefix match first), then by metric ascending
+    defaults.sort_by(|a, b| b.0.cmp(&a.0).then(a.1.cmp(&b.1)));
+    if let Some((_, _, dev)) = defaults.first() {
        Ok(dev.clone())
    } else {
        Ok(String::new())
@@ -212,7 +249,10 @@ mod tests {
    async fn test_network_no_connection() {
        let state = mock_state(AppState::default());
        let config = Config::default();
-        let output = NetworkModule.run(&config, &state, &[]).await.unwrap();
+        let output = NetworkModule
+            .run(&config, &state.receivers, &[])
+            .await
+            .unwrap();
        assert_eq!(output.text, "No connection");
    }

@@ -228,7 +268,10 @@ mod tests {
            ..Default::default()
        });
        let config = Config::default();
-        let output = NetworkModule.run(&config, &state, &[]).await.unwrap();
+        let output = NetworkModule
+            .run(&config, &state.receivers, &[])
+            .await
+            .unwrap();
        assert!(output.text.contains("eth0"));
        assert!(output.text.contains("192.168.1.100"));
        assert!(output.text.contains("1.50"));
@@ -247,7 +290,10 @@ mod tests {
            ..Default::default()
        });
        let config = Config::default();
-        let output = NetworkModule.run(&config, &state, &[]).await.unwrap();
+        let output = NetworkModule
+            .run(&config, &state.receivers, &[])
+            .await
+            .unwrap();
        assert!(output.text.starts_with("  "));
    }

@@ -263,7 +309,10 @@ mod tests {
            ..Default::default()
        });
        let config = Config::default();
-        let output = NetworkModule.run(&config, &state, &[]).await.unwrap();
+        let output = NetworkModule
+            .run(&config, &state.receivers, &[])
+            .await
+            .unwrap();
        assert!(output.text.contains("No IP"));
    }
 }
@@ -2,7 +2,7 @@ use crate::config::Config;
 use crate::error::Result;
 use crate::modules::WaybarModule;
 use crate::output::WaybarOutput;
-use crate::state::SharedState;
+use crate::state::AppReceivers;
 use crate::utils::{TokenValue, format_template};
 use std::fs;

@@ -12,7 +12,7 @@ impl WaybarModule for PowerModule {
    async fn run(
        &self,
        config: &Config,
-        _state: &SharedState,
+        _state: &AppReceivers,
        _args: &[&str],
    ) -> Result<WaybarOutput> {
        let critical_threshold = 15;
@@ -2,7 +2,7 @@ use crate::config::Config;
 use crate::error::Result;
 use crate::modules::WaybarModule;
 use crate::output::WaybarOutput;
-use crate::state::SharedState;
+use crate::state::AppReceivers;
 use crate::utils::{TokenValue, format_template};

 pub struct SysModule;
@@ -11,17 +11,17 @@ impl WaybarModule for SysModule {
    async fn run(
        &self,
        config: &Config,
-        state: &SharedState,
+        state: &AppReceivers,
        _args: &[&str],
    ) -> Result<WaybarOutput> {
        let (load1, load5, load15, uptime_secs, process_count) = {
-            let state_lock = state.read().await;
+            let state_lock = state.sys.borrow();
            (
-                state_lock.sys.load_1,
-                state_lock.sys.load_5,
-                state_lock.sys.load_15,
-                state_lock.sys.uptime,
-                state_lock.sys.process_count,
+                state_lock.load_1,
+                state_lock.load_5,
+                state_lock.load_15,
+                state_lock.uptime,
+                state_lock.process_count,
            )
        };

@@ -1,6 +1,6 @@
-use serde::Serialize;
+use serde::{Deserialize, Serialize};

-#[derive(Serialize, Default)]
+#[derive(Serialize, Deserialize, Clone, Debug, Default)]
 pub struct WaybarOutput {
    pub text: String,
    #[serde(skip_serializing_if = "Option::is_none")]
@@ -0,0 +1,125 @@
+use crate::config::Config;
+use crate::error::{FluxoError, Result as FluxoResult};
+use crate::output::WaybarOutput;
+use crate::state::AppReceivers;
+
+#[allow(unused_imports)]
+use crate::modules::WaybarModule;
+
+pub async fn dispatch(
+    module_name: &str,
+    #[allow(unused)] config: &Config,
+    #[allow(unused)] state: &AppReceivers,
+    #[allow(unused)] args: &[&str],
+) -> FluxoResult<WaybarOutput> {
+    if !config.is_module_enabled(module_name) {
+        return Err(FluxoError::Disabled(module_name.to_string()));
+    }
+
+    match module_name {
+        #[cfg(feature = "mod-network")]
+        "net" | "network" => {
+            crate::modules::network::NetworkModule
+                .run(config, state, args)
+                .await
+        }
+        #[cfg(feature = "mod-hardware")]
+        "cpu" => {
+            crate::modules::cpu::CpuModule
+                .run(config, state, args)
+                .await
+        }
+        #[cfg(feature = "mod-hardware")]
+        "mem" | "memory" => {
+            crate::modules::memory::MemoryModule
+                .run(config, state, args)
+                .await
+        }
+        #[cfg(feature = "mod-hardware")]
+        "disk" => {
+            crate::modules::disk::DiskModule
+                .run(config, state, args)
+                .await
+        }
+        #[cfg(feature = "mod-hardware")]
+        "pool" | "btrfs" => {
+            crate::modules::btrfs::BtrfsModule
+                .run(config, state, args)
+                .await
+        }
+        #[cfg(feature = "mod-audio")]
+        "vol" | "audio" => {
+            crate::modules::audio::AudioModule
+                .run(config, state, args)
+                .await
+        }
+        #[cfg(feature = "mod-audio")]
+        "mic" => {
+            crate::modules::audio::AudioModule
+                .run(config, state, args)
+                .await
+        }
+        #[cfg(feature = "mod-hardware")]
+        "gpu" => {
+            crate::modules::gpu::GpuModule
+                .run(config, state, args)
+                .await
+        }
+        #[cfg(feature = "mod-hardware")]
+        "sys" => {
+            crate::modules::sys::SysModule
+                .run(config, state, args)
+                .await
+        }
+        #[cfg(feature = "mod-bt")]
+        "bt" | "bluetooth" => crate::modules::bt::BtModule.run(config, state, args).await,
+        #[cfg(feature = "mod-hardware")]
+        "power" => {
+            crate::modules::power::PowerModule
+                .run(config, state, args)
+                .await
+        }
+        #[cfg(feature = "mod-hardware")]
+        "game" => {
+            crate::modules::game::GameModule
+                .run(config, state, args)
+                .await
+        }
+        #[cfg(feature = "mod-dbus")]
+        "backlight" => {
+            crate::modules::backlight::BacklightModule
+                .run(config, state, args)
+                .await
+        }
+        #[cfg(feature = "mod-dbus")]
+        "kbd" | "keyboard" => {
+            crate::modules::keyboard::KeyboardModule
+                .run(config, state, args)
+                .await
+        }
+        #[cfg(feature = "mod-dbus")]
+        "dnd" => {
+            crate::modules::dnd::DndModule
+                .run(config, state, args)
+                .await
+        }
+        #[cfg(feature = "mod-dbus")]
+        "mpris" => {
+            crate::modules::mpris::MprisModule
+                .run(config, state, args)
+                .await
+        }
+        _ => Err(FluxoError::Ipc(format!("Unknown module: {}", module_name))),
+    }
+}
+
+/// Returns the default args used by the signaler when evaluating a module.
+pub fn signaler_default_args(module_name: &str) -> &'static [&'static str] {
+    match module_name {
+        "disk" => &["/"],
+        "vol" | "audio" => &["sink", "show"],
+        "mic" => &["source", "show"],
+        "bt" | "bluetooth" => &["show"],
+        _ => &[],
+    }
+}
@@ -0,0 +1,224 @@
+use crate::config::Config;
+use crate::state::AppReceivers;
+use std::collections::HashMap;
+use std::sync::Arc;
+use sysinfo::{ProcessesToUpdate, System};
+use tokio::sync::RwLock;
+use tokio::time::{Duration, Instant, sleep};
+use tracing::{debug, warn};
+
+pub struct WaybarSignaler {
+    cached_pid: Option<i32>,
+    sys: System,
+    last_signal_sent: HashMap<i32, Instant>,
+}
+
+impl WaybarSignaler {
+    pub fn new() -> Self {
+        Self {
+            cached_pid: None,
+            sys: System::new(),
+            last_signal_sent: HashMap::new(),
+        }
+    }
+
+    fn find_waybar_pid(&mut self) -> Option<i32> {
+        self.sys.refresh_processes(ProcessesToUpdate::All, true);
+        for (pid, process) in self.sys.processes() {
+            if process.name() == "waybar" {
+                return Some(pid.as_u32() as i32);
+            }
+        }
+        None
+    }
+
+    fn send_signal(&mut self, signal_num: i32) {
+        if let Some(last) = self.last_signal_sent.get(&signal_num)
+            && last.elapsed() < Duration::from_millis(50)
+        {
+            return;
+        }
+
+        let mut valid_pid = false;
+        if let Some(pid) = self.cached_pid
+            && unsafe { libc::kill(pid, 0) } == 0
+        {
+            valid_pid = true;
+        }
+
+        if !valid_pid {
+            self.cached_pid = self.find_waybar_pid();
+        }
+
+        if let Some(pid) = self.cached_pid {
+            let sig = libc::SIGRTMIN() + signal_num;
+            if unsafe { libc::kill(pid, sig) } == 0 {
+                debug!("Sent SIGRTMIN+{} to waybar (PID: {})", signal_num, pid);
+                self.last_signal_sent.insert(signal_num, Instant::now());
+            } else {
+                warn!("Failed to send SIGRTMIN+{} to waybar", signal_num);
+                self.cached_pid = None;
+            }
+        } else {
+            debug!("Waybar process not found, skipping signal.");
+        }
+    }
+
+    pub async fn run(mut self, config_lock: Arc<RwLock<Config>>, mut receivers: AppReceivers) {
+        let mut last_outputs: HashMap<&'static str, String> = HashMap::new();
+
+        loop {
+            let signals = config_lock.read().await.signals.clone();
+
+            macro_rules! check_and_signal {
+                ($module_name:expr, $signal_opt:expr) => {
+                    if let Some(sig) = $signal_opt {
+                        let config = config_lock.read().await;
+                        if let Some(out) = crate::daemon::evaluate_module_for_signaler(
+                            $module_name,
+                            &receivers,
+                            &config,
+                        )
+                        .await
+                        {
+                            if last_outputs.get($module_name) != Some(&out) {
+                                last_outputs.insert($module_name, out);
+                                self.send_signal(sig);
+                            }
+                        }
+                    }
+                };
+            }
+
+            // For disabled features, create futures that never resolve
+            #[cfg(not(feature = "mod-network"))]
+            let net_changed = std::future::pending::<
+                std::result::Result<(), tokio::sync::watch::error::RecvError>,
+            >();
+            #[cfg(feature = "mod-network")]
+            let net_changed = receivers.network.changed();
+
+            #[cfg(not(feature = "mod-hardware"))]
+            let cpu_changed = std::future::pending::<
+                std::result::Result<(), tokio::sync::watch::error::RecvError>,
+            >();
+            #[cfg(feature = "mod-hardware")]
+            let cpu_changed = receivers.cpu.changed();
+
+            #[cfg(not(feature = "mod-hardware"))]
+            let mem_changed = std::future::pending::<
+                std::result::Result<(), tokio::sync::watch::error::RecvError>,
+            >();
+            #[cfg(feature = "mod-hardware")]
+            let mem_changed = receivers.memory.changed();
+
+            #[cfg(not(feature = "mod-hardware"))]
+            let sys_changed = std::future::pending::<
+                std::result::Result<(), tokio::sync::watch::error::RecvError>,
+            >();
+            #[cfg(feature = "mod-hardware")]
+            let sys_changed = receivers.sys.changed();
+
+            #[cfg(not(feature = "mod-hardware"))]
+            let gpu_changed = std::future::pending::<
+                std::result::Result<(), tokio::sync::watch::error::RecvError>,
+            >();
+            #[cfg(feature = "mod-hardware")]
+            let gpu_changed = receivers.gpu.changed();
+
+            #[cfg(not(feature = "mod-hardware"))]
+            let disks_changed = std::future::pending::<
+                std::result::Result<(), tokio::sync::watch::error::RecvError>,
+            >();
+            #[cfg(feature = "mod-hardware")]
+            let disks_changed = receivers.disks.changed();
+
+            #[cfg(not(feature = "mod-bt"))]
+            let bt_changed = std::future::pending::<
+                std::result::Result<(), tokio::sync::watch::error::RecvError>,
+            >();
+            #[cfg(feature = "mod-bt")]
+            let bt_changed = receivers.bluetooth.changed();
+
+            #[cfg(not(feature = "mod-audio"))]
+            let audio_changed = std::future::pending::<
+                std::result::Result<(), tokio::sync::watch::error::RecvError>,
+            >();
+            #[cfg(feature = "mod-audio")]
+            let audio_changed = receivers.audio.changed();
+
+            #[cfg(not(feature = "mod-dbus"))]
+            let backlight_changed = std::future::pending::<
+                std::result::Result<(), tokio::sync::watch::error::RecvError>,
+            >();
+            #[cfg(feature = "mod-dbus")]
+            let backlight_changed = receivers.backlight.changed();
+
+            #[cfg(not(feature = "mod-dbus"))]
+            let keyboard_changed = std::future::pending::<
+                std::result::Result<(), tokio::sync::watch::error::RecvError>,
+            >();
+            #[cfg(feature = "mod-dbus")]
+            let keyboard_changed = receivers.keyboard.changed();
+
+            #[cfg(not(feature = "mod-dbus"))]
+            let dnd_changed = std::future::pending::<
+                std::result::Result<(), tokio::sync::watch::error::RecvError>,
+            >();
+            #[cfg(feature = "mod-dbus")]
+            let dnd_changed = receivers.dnd.changed();
+
+            #[cfg(not(feature = "mod-dbus"))]
+            let mpris_changed = std::future::pending::<
+                std::result::Result<(), tokio::sync::watch::error::RecvError>,
+            >();
+            #[cfg(feature = "mod-dbus")]
+            let mpris_changed = receivers.mpris.changed();
+
+            tokio::select! {
+                res = net_changed, if signals.network.is_some() => {
+                    if res.is_ok() { check_and_signal!("net", signals.network); }
+                }
+                res = cpu_changed, if signals.cpu.is_some() => {
+                    if res.is_ok() { check_and_signal!("cpu", signals.cpu); }
+                }
+                res = mem_changed, if signals.memory.is_some() => {
+                    if res.is_ok() { check_and_signal!("mem", signals.memory); }
+                }
+                res = sys_changed, if signals.sys.is_some() => {
+                    if res.is_ok() { check_and_signal!("sys", signals.sys); }
+                }
+                res = gpu_changed, if signals.gpu.is_some() => {
+                    if res.is_ok() { check_and_signal!("gpu", signals.gpu); }
+                }
+                res = disks_changed, if signals.disk.is_some() => {
+                    if res.is_ok() { check_and_signal!("disk", signals.disk); }
+                }
+                res = bt_changed, if signals.bt.is_some() => {
+                    if res.is_ok() { check_and_signal!("bt", signals.bt); }
+                }
+                res = audio_changed, if signals.audio.is_some() => {
+                    if res.is_ok() {
+                        check_and_signal!("vol", signals.audio);
+                        check_and_signal!("mic", signals.audio);
+                    }
+                }
+                res = backlight_changed, if signals.backlight.is_some() => {
+                    if res.is_ok() { check_and_signal!("backlight", signals.backlight); }
+                }
+                res = keyboard_changed, if signals.keyboard.is_some() => {
+                    if res.is_ok() { check_and_signal!("keyboard", signals.keyboard); }
+                }
+                res = dnd_changed, if signals.dnd.is_some() => {
+                    if res.is_ok() { check_and_signal!("dnd", signals.dnd); }
+                }
+                res = mpris_changed, if signals.mpris.is_some() => {
+                    if res.is_ok() { check_and_signal!("mpris", signals.mpris); }
+                }
+                _ = sleep(Duration::from_secs(5)) => {
+                    // loop and refresh config
+                }
+            }
+        }
+    }
+}
@@ -1,19 +1,40 @@
+use crate::output::WaybarOutput;
 use std::collections::HashMap;
 use std::sync::Arc;
-use tokio::sync::RwLock;
+use tokio::sync::{RwLock, mpsc, watch};
 use tokio::time::Instant;

-#[derive(Default, Clone)]
-pub struct AppState {
-    pub network: NetworkState,
-    pub cpu: CpuState,
-    pub memory: MemoryState,
-    pub sys: SysState,
-    pub gpu: GpuState,
-    pub disks: Vec<DiskInfo>,
-    pub bluetooth: BtState,
-    pub audio: AudioState,
-    pub health: HashMap<String, ModuleHealth>,
+#[derive(Clone)]
+pub struct AppReceivers {
+    #[cfg(feature = "mod-network")]
+    pub network: watch::Receiver<NetworkState>,
+    #[cfg(feature = "mod-hardware")]
+    pub cpu: watch::Receiver<CpuState>,
+    #[cfg(feature = "mod-hardware")]
+    pub memory: watch::Receiver<MemoryState>,
+    #[cfg(feature = "mod-hardware")]
+    pub sys: watch::Receiver<SysState>,
+    #[cfg(feature = "mod-hardware")]
+    pub gpu: watch::Receiver<GpuState>,
+    #[cfg(feature = "mod-hardware")]
+    pub disks: watch::Receiver<Vec<DiskInfo>>,
+    #[cfg(feature = "mod-bt")]
+    pub bluetooth: watch::Receiver<BtState>,
+    #[cfg(feature = "mod-audio")]
+    pub audio: watch::Receiver<AudioState>,
+    #[cfg(feature = "mod-dbus")]
+    pub mpris: watch::Receiver<MprisState>,
+    #[cfg(feature = "mod-dbus")]
+    pub backlight: watch::Receiver<BacklightState>,
+    #[cfg(feature = "mod-dbus")]
+    pub keyboard: watch::Receiver<KeyboardState>,
+    #[cfg(feature = "mod-dbus")]
+    pub dnd: watch::Receiver<DndState>,
+    pub health: Arc<RwLock<HashMap<String, ModuleHealth>>>,
+    #[cfg(feature = "mod-bt")]
+    pub bt_force_poll: mpsc::Sender<()>,
+    #[cfg(feature = "mod-audio")]
+    pub audio_cmd_tx: mpsc::Sender<crate::modules::audio::AudioCommand>,
 }

 #[derive(Clone, Default)]
@@ -21,12 +42,15 @@ pub struct ModuleHealth {
    pub consecutive_failures: u32,
    pub last_failure: Option<Instant>,
    pub backoff_until: Option<Instant>,
+    pub last_successful_output: Option<WaybarOutput>,
 }

 #[derive(Default, Clone)]
 pub struct AudioState {
    pub sink: AudioDeviceInfo,
    pub source: AudioSourceInfo,
+    pub available_sinks: Vec<String>,
+    pub available_sources: Vec<String>,
 }

 #[derive(Default, Clone)]
@@ -35,6 +59,7 @@ pub struct AudioDeviceInfo {
    pub description: String,
    pub volume: u8,
    pub muted: bool,
+    pub channels: u8,
 }

 #[derive(Default, Clone)]
@@ -43,6 +68,7 @@ pub struct AudioSourceInfo {
    pub description: String,
    pub volume: u8,
    pub muted: bool,
+    pub channels: u8,
 }

 #[derive(Default, Clone)]
@@ -128,9 +154,176 @@ impl Default for GpuState {
    }
 }

-pub type SharedState = Arc<RwLock<AppState>>;
+#[derive(Default, Clone)]
+pub struct DndState {
+    pub is_dnd: bool,
+}
+
+#[derive(Default, Clone)]
+pub struct KeyboardState {
+    pub layout: String,
+}
+
+#[derive(Default, Clone)]
+pub struct BacklightState {
+    pub percentage: u8,
+}
+
+#[derive(Default, Clone)]
+pub struct MprisState {
+    pub is_playing: bool,
+    pub is_paused: bool,
+    pub is_stopped: bool,
+    pub artist: String,
+    pub title: String,
+    pub album: String,
+}

 #[cfg(test)]
-pub fn mock_state(state: AppState) -> SharedState {
-    Arc::new(RwLock::new(state))
+pub struct MockState {
+    pub receivers: AppReceivers,
+    #[cfg(feature = "mod-network")]
+    _net_tx: watch::Sender<NetworkState>,
+    #[cfg(feature = "mod-hardware")]
+    _cpu_tx: watch::Sender<CpuState>,
+    #[cfg(feature = "mod-hardware")]
+    _mem_tx: watch::Sender<MemoryState>,
+    #[cfg(feature = "mod-hardware")]
+    _sys_tx: watch::Sender<SysState>,
+    #[cfg(feature = "mod-hardware")]
+    _gpu_tx: watch::Sender<GpuState>,
+    #[cfg(feature = "mod-hardware")]
+    _disks_tx: watch::Sender<Vec<DiskInfo>>,
+    #[cfg(feature = "mod-bt")]
+    _bt_tx: watch::Sender<BtState>,
+    #[cfg(feature = "mod-audio")]
+    _audio_tx: watch::Sender<AudioState>,
+    #[cfg(feature = "mod-dbus")]
+    _mpris_tx: watch::Sender<MprisState>,
+    #[cfg(feature = "mod-dbus")]
+    _backlight_tx: watch::Sender<BacklightState>,
+    #[cfg(feature = "mod-dbus")]
+    _keyboard_tx: watch::Sender<KeyboardState>,
+    #[cfg(feature = "mod-dbus")]
+    _dnd_tx: watch::Sender<DndState>,
+}
+
+#[cfg(test)]
+#[derive(Default, Clone)]
+pub struct AppState {
+    #[cfg(feature = "mod-network")]
+    pub network: NetworkState,
+    #[cfg(feature = "mod-hardware")]
+    pub cpu: CpuState,
+    #[cfg(feature = "mod-hardware")]
+    pub memory: MemoryState,
+    #[cfg(feature = "mod-hardware")]
+    pub sys: SysState,
+    #[cfg(feature = "mod-hardware")]
+    pub gpu: GpuState,
+    #[cfg(feature = "mod-hardware")]
+    pub disks: Vec<DiskInfo>,
+    #[cfg(feature = "mod-bt")]
+    pub bluetooth: BtState,
+    #[cfg(feature = "mod-audio")]
+    pub audio: AudioState,
+    #[cfg(feature = "mod-dbus")]
+    pub mpris: MprisState,
+    #[cfg(feature = "mod-dbus")]
+    pub backlight: BacklightState,
+    #[cfg(feature = "mod-dbus")]
+    pub keyboard: KeyboardState,
+    #[cfg(feature = "mod-dbus")]
+    pub dnd: DndState,
+    pub health: HashMap<String, ModuleHealth>,
+}
+
+#[cfg(test)]
+pub fn mock_state(state: AppState) -> MockState {
+    #[cfg(feature = "mod-network")]
+    let (net_tx, net_rx) = watch::channel(state.network);
+    #[cfg(feature = "mod-hardware")]
+    let (cpu_tx, cpu_rx) = watch::channel(state.cpu);
+    #[cfg(feature = "mod-hardware")]
+    let (mem_tx, mem_rx) = watch::channel(state.memory);
+    #[cfg(feature = "mod-hardware")]
+    let (sys_tx, sys_rx) = watch::channel(state.sys);
+    #[cfg(feature = "mod-hardware")]
+    let (gpu_tx, gpu_rx) = watch::channel(state.gpu);
+    #[cfg(feature = "mod-hardware")]
+    let (disks_tx, disks_rx) = watch::channel(state.disks);
+    #[cfg(feature = "mod-bt")]
+    let (bt_tx, bt_rx) = watch::channel(state.bluetooth);
+    #[cfg(feature = "mod-audio")]
+    let (audio_tx, audio_rx) = watch::channel(state.audio);
+    #[cfg(feature = "mod-dbus")]
+    let (mpris_tx, mpris_rx) = watch::channel(state.mpris);
+    #[cfg(feature = "mod-dbus")]
+    let (backlight_tx, backlight_rx) = watch::channel(state.backlight);
+    #[cfg(feature = "mod-dbus")]
+    let (keyboard_tx, keyboard_rx) = watch::channel(state.keyboard);
+    #[cfg(feature = "mod-dbus")]
+    let (dnd_tx, dnd_rx) = watch::channel(state.dnd);
+    #[cfg(feature = "mod-bt")]
+    let (bt_force_tx, _) = mpsc::channel(1);
+    #[cfg(feature = "mod-audio")]
+    let (audio_cmd_tx, _) = mpsc::channel(1);
+
+    MockState {
+        receivers: AppReceivers {
+            #[cfg(feature = "mod-network")]
+            network: net_rx,
+            #[cfg(feature = "mod-hardware")]
+            cpu: cpu_rx,
+            #[cfg(feature = "mod-hardware")]
+            memory: mem_rx,
+            #[cfg(feature = "mod-hardware")]
+            sys: sys_rx,
+            #[cfg(feature = "mod-hardware")]
+            gpu: gpu_rx,
+            #[cfg(feature = "mod-hardware")]
+            disks: disks_rx,
+            #[cfg(feature = "mod-bt")]
+            bluetooth: bt_rx,
+            #[cfg(feature = "mod-audio")]
+            audio: audio_rx,
+            #[cfg(feature = "mod-dbus")]
+            mpris: mpris_rx,
+            #[cfg(feature = "mod-dbus")]
+            backlight: backlight_rx,
+            #[cfg(feature = "mod-dbus")]
+            keyboard: keyboard_rx,
+            #[cfg(feature = "mod-dbus")]
+            dnd: dnd_rx,
+            health: Arc::new(RwLock::new(state.health)),
+            #[cfg(feature = "mod-bt")]
+            bt_force_poll: bt_force_tx,
+            #[cfg(feature = "mod-audio")]
+            audio_cmd_tx,
+        },
+        #[cfg(feature = "mod-network")]
+        _net_tx: net_tx,
+        #[cfg(feature = "mod-hardware")]
+        _cpu_tx: cpu_tx,
+        #[cfg(feature = "mod-hardware")]
+        _mem_tx: mem_tx,
+        #[cfg(feature = "mod-hardware")]
+        _sys_tx: sys_tx,
+        #[cfg(feature = "mod-hardware")]
+        _gpu_tx: gpu_tx,
+        #[cfg(feature = "mod-hardware")]
+        _disks_tx: disks_tx,
+        #[cfg(feature = "mod-bt")]
+        _bt_tx: bt_tx,
+        #[cfg(feature = "mod-audio")]
+        _audio_tx: audio_tx,
+        #[cfg(feature = "mod-dbus")]
+        _mpris_tx: mpris_tx,
+        #[cfg(feature = "mod-dbus")]
+        _backlight_tx: backlight_tx,
+        #[cfg(feature = "mod-dbus")]
+        _keyboard_tx: keyboard_tx,
+        #[cfg(feature = "mod-dbus")]
+        _dnd_tx: dnd_tx,
+    }
 }
@@ -3,17 +3,21 @@ use std::io::Write;
 use std::process::{Command, Stdio};

 pub fn show_menu(prompt: &str, items: &[String], menu_cmd: &str) -> Result<String> {
+    // Backward compatibility for {prompt}, but environment variable is safer
    let cmd_str = menu_cmd.replace("{prompt}", prompt);
    let mut child = Command::new("sh")
        .arg("-c")
        .arg(&cmd_str)
+        .env("FLUXO_PROMPT", prompt) // Safer shell injection
        .stdin(Stdio::piped())
        .stdout(Stdio::piped())
+        .stderr(Stdio::null()) // Suppress GTK/Wayland warnings from tools like wofi
        .spawn()
        .context("Failed to spawn menu command")?;

    if let Some(mut stdin) = child.stdin.take() {
-        let input = items.join("\n");
+        let mut input = items.join("\n");
+        input.push('\n'); // Ensure trailing newline for wofi/rofi
        stdin
            .write_all(input.as_bytes())
            .context("Failed to write to menu stdin")?;
@@ -33,24 +37,64 @@ pub fn show_menu(prompt: &str, items: &[String], menu_cmd: &str) -> Result<Strin
    Ok(selected)
 }

+pub fn get_hyprland_socket(socket_name: &str) -> Result<std::path::PathBuf> {
+    let signature = std::env::var("HYPRLAND_INSTANCE_SIGNATURE")
+        .context("HYPRLAND_INSTANCE_SIGNATURE not set")?;
+
+    // Try XDG_RUNTIME_DIR first (usually /run/user/1000)
+    if let Ok(runtime_dir) = std::env::var("XDG_RUNTIME_DIR") {
+        let path = std::path::PathBuf::from(runtime_dir)
+            .join("hypr")
+            .join(&signature)
+            .join(socket_name);
+        if path.exists() {
+            return Ok(path);
+        }
+    }
+
+    // Fallback to /tmp
+    let path = std::path::PathBuf::from("/tmp/hypr")
+        .join(&signature)
+        .join(socket_name);
+
+    if path.exists() {
+        Ok(path)
+    } else {
+        Err(anyhow::anyhow!(
+            "Hyprland socket {} not found in runtime dir or /tmp",
+            socket_name
+        ))
+    }
+}
+
 use regex::Regex;
 use std::sync::LazyLock;

+pub fn classify_usage(value: f64, high: f64, max: f64) -> &'static str {
+    if value > max {
+        "max"
+    } else if value > high {
+        "high"
+    } else {
+        "normal"
+    }
+}
+
 pub enum TokenValue {
    Float(f64),
    Int(i64),
    String(String),
 }

+pub static TOKEN_RE: LazyLock<Regex> =
+    LazyLock::new(|| Regex::new(r"\{([a-zA-Z0-9_]+)(?::([<>\^])?(\d+)?(?:\.(\d+))?)?\}").unwrap());
+
 pub fn format_template<K>(template: &str, values: &[(K, TokenValue)]) -> String
 where
    K: AsRef<str>,
 {
-    static RE: LazyLock<Regex> = LazyLock::new(|| {
-        Regex::new(r"\{([a-zA-Z0-9_]+)(?::([<>\^])?(\d+)?(?:\.(\d+))?)?\}").unwrap()
-    });
-
-    RE.replace_all(template, |caps: &regex::Captures| {
+    TOKEN_RE
+        .replace_all(template, |caps: &regex::Captures| {
            let name = &caps[1];
            if let Some((_, val)) = values.iter().find(|(k, _)| k.as_ref() == name) {
                let align = caps.get(2).map(|m| m.as_str()).unwrap_or(">");
Author	SHA1	Message	Date
nvrl	75601305e2	version bump Release / Build and Release (push) Successful in 2m47s Details	2026-04-04 04:25:04 +02:00
nvrl	52cc041c42	clippy	2026-04-04 04:24:35 +02:00
nvrl	cb8b641447	implemented 'enabled'	2026-04-04 04:24:09 +02:00
nvrl	071d973fea	version bump Release / Build and Release (push) Successful in 2m53s Details	2026-04-04 00:18:50 +02:00
nvrl	31072bc645	refactor + feature flags Release / Build and Release (push) Has been cancelled Details	2026-04-04 00:18:22 +02:00
nvrl	941942d550	fixed dnd	2026-04-03 23:45:58 +02:00
nvrl	492f0787cb	WIP: version bump Release / Build and Release (push) Failing after 2m43s Details	2026-04-03 15:16:27 +02:00
nvrl	718d3f99e9	version bump Release / Build and Release (push) Failing after 22s Details	2026-04-03 15:15:13 +02:00
nvrl	b2e8d5fc1b	updated docu	2026-04-03 15:14:49 +02:00
nvrl	2572928195	Merge pull request 'feature/events' (#2 ) from feature/events into main Release / Build and Release (push) Successful in 21s Details Reviewed-on: #2	2026-04-03 15:02:09 +02:00
nvrl	25ecde96fa	clippy CI / Lint and Test (pull_request) Failing after 1m31s Details CI / Version Check (pull_request) Failing after 3s Details	2026-04-03 15:01:23 +02:00
nvrl	16d12e6dce	implemented signal based daemon and dbus events + mpris/dnd/keyboard module	2026-04-03 15:00:58 +02:00
nvrl	d28e51de6d	version bupm Release / Build and Release (push) Successful in 2m10s Details	2026-04-02 18:46:33 +02:00
nvrl	b18af49ac8	graceful shutdown Release / Build and Release (push) Has been cancelled Details	2026-04-02 18:46:17 +02:00
nvrl	0617e53412	version bump Release / Build and Release (push) Successful in 2m8s Details	2026-04-02 18:11:47 +02:00
nvrl	bdbd6a8a40	added tokio shared states instead of monolithic state Release / Build and Release (push) Has been cancelled Details	2026-04-02 18:11:21 +02:00