redesign bt module/menu

Cargo.lock

@@ -572,7 +572,7 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
 
 [[package]]
 name = "fluxo-rs"
-version = "0.4.0"
+version = "0.5.0"
 dependencies = [
  "anyhow",
  "bluer",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fluxo-rs"
-version = "0.4.0"
+version = "0.5.0"
 edition = "2024"
 
 [features]

example.config.toml

@@ -29,40 +29,49 @@ backlight = 13
 dnd = 14
 
 [network]
+# 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]
+# 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]
+# 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]
+# 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]
+# 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}"
 
 [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}"
@@ -70,6 +79,7 @@ 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}"
@@ -77,21 +87,30 @@ 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
+# max_length = 30          # truncate text beyond this character length (adds '...')
+# scroll = true            # enable marquee scroll animation (requires max_length)
+# scroll_speed = 500       # ms between scroll steps (only while playing)
+# scroll_separator = " /// "  # separator shown between loops when scrolling
 # 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>"

src/config.rs

@@ -91,12 +91,15 @@ pub struct SignalsConfig {
 
 #[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(),
         }
     }
@@ -104,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(),
         }
     }
@@ -117,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(),
         }
     }
@@ -130,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,
@@ -138,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(),
@@ -149,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(),
         }
     }
@@ -162,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(),
         }
     }
@@ -175,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(),
         }
     }
@@ -188,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(),
         }
     }
@@ -201,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,
@@ -210,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(),
@@ -220,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,
@@ -229,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(),
@@ -239,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,
 }
@@ -246,6 +278,7 @@ 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(),
         }
@@ -254,25 +287,51 @@ impl Default for GameConfig {
 
 #[derive(Deserialize, Clone)]
 pub struct MprisConfig {
+    #[serde(default = "default_true")]
+    pub enabled: bool,
     pub format: String,
+    #[serde(default)]
+    pub max_length: Option<usize>,
+    #[serde(default)]
+    pub scroll: bool,
+    #[serde(default = "default_scroll_speed")]
+    pub scroll_speed: u64,
+    #[serde(default = "default_scroll_separator")]
+    pub scroll_separator: String,
+}
+
+fn default_scroll_speed() -> u64 {
+    500
+}
+
+fn default_scroll_separator() -> String {
+    " /// ".to_string()
 }
 
 impl Default for MprisConfig {
     fn default() -> Self {
         Self {
+            enabled: true,
             format: "{status_icon} {artist} - {title}".to_string(),
+            max_length: None,
+            scroll: false,
+            scroll_speed: 500,
+            scroll_separator: " /// ".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(),
         }
     }
@@ -280,12 +339,15 @@ impl Default for BacklightConfig {
 
 #[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(),
         }
     }
@@ -293,13 +355,20 @@ impl Default for KeyboardConfig {
 
 #[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(),
         }
@@ -325,6 +394,44 @@ 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(

src/daemon.rs

@@ -78,9 +78,15 @@ pub async fn run_daemon(config_path: Option<PathBuf>) -> Result<()> {
     let (keyboard_tx, keyboard_rx) = watch::channel(Default::default());
     #[cfg(feature = "mod-dbus")]
     let (dnd_tx, dnd_rx) = watch::channel(Default::default());
+    #[cfg(feature = "mod-dbus")]
+    let mpris_scroll = Arc::new(RwLock::new(crate::state::MprisScrollState::default()));
+    #[cfg(feature = "mod-dbus")]
+    let (mpris_scroll_tick_tx, mpris_scroll_tick_rx) = watch::channel(0u64);
     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-bt")]
+    let bt_cycle = Arc::new(RwLock::new(0usize));
     #[cfg(feature = "mod-audio")]
     let (audio_cmd_tx, audio_cmd_rx) = mpsc::channel(8);
 
@@ -99,6 +105,8 @@ pub async fn run_daemon(config_path: Option<PathBuf>) -> Result<()> {
         disks: disks_rx,
         #[cfg(feature = "mod-bt")]
         bluetooth: bt_rx,
+        #[cfg(feature = "mod-bt")]
+        bt_cycle,
         #[cfg(feature = "mod-audio")]
         audio: audio_rx,
         #[cfg(feature = "mod-dbus")]
@@ -109,6 +117,10 @@ pub async fn run_daemon(config_path: Option<PathBuf>) -> Result<()> {
         keyboard: keyboard_rx,
         #[cfg(feature = "mod-dbus")]
         dnd: dnd_rx,
+        #[cfg(feature = "mod-dbus")]
+        mpris_scroll: Arc::clone(&mpris_scroll),
+        #[cfg(feature = "mod-dbus")]
+        mpris_scroll_tick: mpris_scroll_tick_rx,
         health: Arc::clone(&health),
         #[cfg(feature = "mod-bt")]
         bt_force_poll: bt_force_tx,
@@ -183,7 +195,7 @@ pub async fn run_daemon(config_path: Option<PathBuf>) -> Result<()> {
 
     // 1. Network Task
     #[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 {
@@ -206,48 +218,58 @@ pub async fn run_daemon(config_path: Option<PathBuf>) -> Result<()> {
     // 2. Fast Hardware Task (CPU, Mem, Load)
     #[cfg(feature = "mod-hardware")]
     {
-        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 {
-                if !crate::health::is_poll_in_backoff("cpu", &hw_health).await {
-                    daemon.poll_fast(&cpu_tx, &mem_tx, &sys_tx).await;
+        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 {
+                    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)) => {}
+                    }
                 }
-                tokio::select! {
-                    _ = token.cancelled() => break,
-                    _ = sleep(Duration::from_secs(1)) => {}
-                }
-            }
-            info!("Fast Hardware task shut down.");
-        });
+                info!("Fast Hardware task shut down.");
+            });
+        }
     }
 
     // 3. Slow Hardware Task (GPU, Disks)
     #[cfg(feature = "mod-hardware")]
     {
-        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 {
-                if !crate::health::is_poll_in_backoff("gpu", &slow_health).await {
-                    daemon.poll_slow(&gpu_tx, &disks_tx).await;
+        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 {
+                    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)) => {}
+                    }
                 }
-                tokio::select! {
-                    _ = token.cancelled() => break,
-                    _ = sleep(Duration::from_secs(5)) => {}
-                }
-            }
-            info!("Slow Hardware task shut down.");
-        });
+                info!("Slow Hardware task shut down.");
+            });
+        }
     }
 
     // 4. Bluetooth Task
     #[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);
@@ -272,37 +294,51 @@ pub async fn run_daemon(config_path: Option<PathBuf>) -> Result<()> {
 
     // 5. Audio Thread (Event driven)
     #[cfg(feature = "mod-audio")]
-    {
+    if config.read().await.audio.enabled {
         let audio_daemon = AudioDaemon::new();
         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);
+
+        // Scroll ticker for MPRIS marquee animation
+        let scroll_config = Arc::clone(&config);
+        let scroll_rx = receivers.mpris.clone();
+        let scroll_state = Arc::clone(&mpris_scroll);
+        tokio::spawn(async move {
+            crate::modules::mpris::mpris_scroll_ticker(
+                scroll_config,
+                scroll_rx,
+                scroll_state,
+                mpris_scroll_tick_tx,
+            )
+            .await;
+        });
     }
 
     // 6. Waybar Signaler Task
@@ -416,6 +452,9 @@ async fn handle_request(
 
     match result {
         Ok(output) => serde_json::to_string(&output).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),
     }
 }

src/error.rs

@@ -33,6 +33,9 @@ pub enum FluxoError {
     #[error("Serialization error: {0}")]
     Serialization(#[from] serde_json::Error),
 
+    #[error("Module disabled: {0}")]
+    Disabled(String),
+
     #[error("Other error: {0}")]
     Other(#[from] anyhow::Error),
 }

src/health.rs

@@ -36,6 +36,7 @@ pub async fn update_health(
             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());

src/main.rs

@@ -83,43 +83,79 @@ fn main() {
             let config = config::load_config(None);
             let mut items = Vec::new();
 
-            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())
-                && !modes_str.is_empty()
-            {
-                for mode in modes_str.lines() {
-                    items.push(format!("Mode: {}", mode));
-                }
-            }
-
-            if !items.is_empty() {
-                items.push("Disconnect".to_string());
-            }
-
-            items.push("--- Connect Device ---".to_string());
+            // Parse menu_data to get connected and paired devices
+            let mut connected: Vec<(String, String)> = Vec::new(); // (alias, mac)
+            let mut paired: Vec<(String, String)> = Vec::new();
 
             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())
+                && let Some(text) = val.get("text").and_then(|t| t.as_str())
             {
-                for line in devices_str.lines() {
-                    if !line.is_empty() {
-                        items.push(line.to_string());
+                for line in text.lines() {
+                    if let Some(rest) = line.strip_prefix("CONNECTED:")
+                        && let Some((alias, mac)) = rest.split_once('|')
+                    {
+                        connected.push((alias.to_string(), mac.to_string()));
+                    } else if let Some(rest) = line.strip_prefix("PAIRED:")
+                        && let Some((alias, mac)) = rest.split_once('|')
+                    {
+                        paired.push((alias.to_string(), mac.to_string()));
                     }
                 }
             }
 
+            // Per-device sections for connected devices
+            for (alias, mac) in &connected {
+                // Get modes for this specific device
+                if let Ok(json_str) = ipc::request_data("bt", &["get_modes", mac])
+                    && 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())
+                    && !modes_str.is_empty()
+                {
+                    for mode in modes_str.lines() {
+                        items.push(format!("{}: Mode: {} [{}]", alias, mode, mac));
+                    }
+                }
+                items.push(format!("Disconnect {} [{}]", alias, mac));
+            }
+
+            // Separator and paired devices for connecting
+            if !paired.is_empty() {
+                items.push("--- Connect Device ---".to_string());
+                for (alias, mac) in &paired {
+                    items.push(format!("{} ({})", alias, mac));
+                }
+            }
+
             if !items.is_empty() {
                 if let Ok(selected) =
                     utils::show_menu("BT Menu: ", &items, &config.general.menu_command)
                 {
-                    if let Some(mode) = selected.strip_prefix("Mode: ") {
-                        handle_ipc_response(ipc::request_data("bt", &["set_mode", mode]));
-                    } else if selected == "Disconnect" {
-                        handle_ipc_response(ipc::request_data("bt", &["disconnect"]));
+                    if selected.contains(": Mode: ") {
+                        // "<alias>: Mode: <mode> [<MAC>]"
+                        if let Some(bracket_start) = selected.rfind('[')
+                            && let Some(bracket_end) = selected.rfind(']')
+                        {
+                            let mac = &selected[bracket_start + 1..bracket_end];
+                            if let Some(mode_start) = selected.find(": Mode: ") {
+                                let mode =
+                                    &selected[mode_start + ": Mode: ".len()..bracket_start - 1];
+                                handle_ipc_response(ipc::request_data(
+                                    "bt",
+                                    &["set_mode", mode, mac],
+                                ));
+                            }
+                        }
+                    } else if selected.starts_with("Disconnect ") {
+                        // "Disconnect <alias> [<MAC>]"
+                        if let Some(bracket_start) = selected.rfind('[')
+                            && let Some(bracket_end) = selected.rfind(']')
+                        {
+                            let mac = &selected[bracket_start + 1..bracket_end];
+                            handle_ipc_response(ipc::request_data("bt", &["disconnect", mac]));
+                        }
                     } else if selected == "--- Connect Device ---" {
-                        // Do nothing
+                        // separator, do nothing
                     } else if let Some(mac_start) = selected.rfind('(')
                         && let Some(mac_end) = selected.rfind(')')
                     {

src/modules/audio.rs

@@ -9,6 +9,7 @@ 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::sync::Arc;
 use tokio::sync::{mpsc, watch};
 use tracing::error;
 
@@ -230,15 +231,16 @@ fn fetch_audio_data_sync(
     });
 
     let tx_sink = state_tx.clone();
+    let pending_sinks: Arc<std::sync::Mutex<Vec<String>>> =
+        Arc::new(std::sync::Mutex::new(Vec::new()));
+    let pending_sinks_cb = Arc::clone(&pending_sinks);
     context.introspect().get_sink_info_list(move |res| {
         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);
-                    }
+                    pending_sinks_cb.lock().unwrap().push(name_str);
                 }
 
                 let is_default = item
@@ -261,8 +263,7 @@ fn fetch_audio_data_sync(
                 let _ = tx_sink.send(current);
             }
             ListResult::End => {
-                // Clear the list on End so it rebuilds fresh next time
-                current.available_sinks.clear();
+                current.available_sinks = pending_sinks_cb.lock().unwrap().drain(..).collect();
                 let _ = tx_sink.send(current);
             }
             ListResult::Error => {}
@@ -270,17 +271,17 @@ fn fetch_audio_data_sync(
     });
 
     let tx_source = state_tx.clone();
+    let pending_sources: Arc<std::sync::Mutex<Vec<String>>> =
+        Arc::new(std::sync::Mutex::new(Vec::new()));
+    let pending_sources_cb = Arc::clone(&pending_sources);
     context.introspect().get_source_info_list(move |res| {
         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);
+                    if !name_str.contains(".monitor") {
+                        pending_sources_cb.lock().unwrap().push(name_str);
                     }
                 }
 
@@ -304,8 +305,7 @@ fn fetch_audio_data_sync(
                 let _ = tx_source.send(current);
             }
             ListResult::End => {
-                // Clear the list on End so it rebuilds fresh next time
-                current.available_sources.clear();
+                current.available_sources = pending_sources_cb.lock().unwrap().drain(..).collect();
                 let _ = tx_source.send(current);
             }
             ListResult::Error => {}
@@ -331,19 +331,19 @@ impl WaybarModule for AudioModule {
         match *action {
             "up" => {
                 self.change_volume(state, target_type, step, true).await?;
-                Ok(WaybarOutput::default())
+                self.get_status(config, state, target_type).await
             }
             "down" => {
                 self.change_volume(state, target_type, step, false).await?;
-                Ok(WaybarOutput::default())
+                self.get_status(config, state, target_type).await
             }
             "mute" => {
                 self.toggle_mute(state, target_type).await?;
-                Ok(WaybarOutput::default())
+                self.get_status(config, state, target_type).await
             }
             "cycle" => {
                 self.cycle_device(state, target_type).await?;
-                Ok(WaybarOutput::default())
+                self.get_status(config, state, target_type).await
             }
             "show" => self.get_status(config, state, target_type).await,
             other => Err(FluxoError::Module {

src/modules/bt/mod.rs

@@ -5,7 +5,7 @@ use crate::config::Config;
 use crate::error::Result as FluxoResult;
 use crate::modules::WaybarModule;
 use crate::output::WaybarOutput;
-use crate::state::{AppReceivers, BtState};
+use crate::state::{AppReceivers, BtDeviceInfo, BtState};
 use crate::utils::{TokenValue, format_template};
 use anyhow::Result;
 use std::sync::LazyLock;
@@ -47,60 +47,64 @@ impl BtDaemon {
         let adapter = session.default_adapter().await?;
         let adapter_powered = adapter.is_powered().await.unwrap_or(false);
 
-        let mut bt_state = BtState {
-            adapter_powered,
-            ..Default::default()
-        };
+        let mut connected_devices = Vec::new();
 
         if adapter_powered {
-            let devices = adapter.device_addresses().await?;
-            for addr in devices {
-                let device = adapter.device(addr)?;
-                if device.is_connected().await.unwrap_or(false) {
-                    let uuids = device.uuids().await?.unwrap_or_default();
-                    let audio_sink_uuid =
-                        bluer::Uuid::from_u128(0x0000110b_0000_1000_8000_00805f9b34fb);
-                    if uuids.contains(&audio_sink_uuid) {
-                        bt_state.connected = true;
-                        bt_state.device_address = addr.to_string();
-                        bt_state.device_alias =
-                            device.alias().await.unwrap_or_else(|_| addr.to_string());
-                        bt_state.battery_percentage =
-                            device.battery_percentage().await.unwrap_or(None);
+            let mut addresses = adapter.device_addresses().await?;
+            addresses.sort();
+            let audio_sink_uuid = bluer::Uuid::from_u128(0x0000110b_0000_1000_8000_00805f9b34fb);
 
-                        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 {
-                                    Ok(data) => {
-                                        bt_state.plugin_data = data
-                                            .into_iter()
-                                            .map(|(k, v)| {
-                                                let val_str = match v {
-                                                    TokenValue::String(s) => s,
-                                                    TokenValue::Int(i) => i.to_string(),
-                                                    TokenValue::Float(f) => format!("{:.1}", f),
-                                                };
-                                                (k, val_str)
-                                            })
-                                            .collect();
-                                    }
-                                    Err(e) => {
-                                        warn!("Plugin {} failed for {}: {}", p.name(), addr, e);
-                                        bt_state
-                                            .plugin_data
-                                            .push(("plugin_error".to_string(), e.to_string()));
-                                    }
-                                }
-                                break;
+            for addr in addresses {
+                let device = adapter.device(addr)?;
+                if !device.is_connected().await.unwrap_or(false) {
+                    continue;
+                }
+                let uuids = device.uuids().await?.unwrap_or_default();
+                if !uuids.contains(&audio_sink_uuid) {
+                    continue;
+                }
+
+                let mut dev_info = BtDeviceInfo {
+                    device_address: addr.to_string(),
+                    device_alias: device.alias().await.unwrap_or_else(|_| addr.to_string()),
+                    battery_percentage: device.battery_percentage().await.unwrap_or(None),
+                    plugin_data: vec![],
+                };
+
+                for p in PLUGINS.iter() {
+                    if p.can_handle(&dev_info.device_alias, &dev_info.device_address) {
+                        match p.get_data(config, state, &dev_info.device_address).await {
+                            Ok(data) => {
+                                dev_info.plugin_data = data
+                                    .into_iter()
+                                    .map(|(k, v)| {
+                                        let val_str = match v {
+                                            TokenValue::String(s) => s,
+                                            TokenValue::Int(i) => i.to_string(),
+                                            TokenValue::Float(f) => format!("{:.1}", f),
+                                        };
+                                        (k, val_str)
+                                    })
+                                    .collect();
+                            }
+                            Err(e) => {
+                                warn!("Plugin {} failed for {}: {}", p.name(), addr, e);
+                                dev_info
+                                    .plugin_data
+                                    .push(("plugin_error".to_string(), e.to_string()));
                             }
                         }
                         break;
                     }
                 }
+                connected_devices.push(dev_info);
             }
         }
 
-        let _ = tx.send(bt_state);
+        let _ = tx.send(BtState {
+            adapter_powered,
+            devices: connected_devices,
+        });
 
         Ok(())
     }
@@ -111,8 +115,6 @@ static PLUGINS: LazyLock<Vec<Box<dyn BtPlugin>>> =
 
 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(());
@@ -120,6 +122,26 @@ fn trigger_robust_poll(state: AppReceivers) {
     });
 }
 
+/// Resolve a target MAC: use explicit arg if given, otherwise fall back to the active device.
+async fn resolve_target_mac(
+    bt_state: &BtState,
+    state: &AppReceivers,
+    explicit_mac: Option<&str>,
+) -> Option<String> {
+    if let Some(mac) = explicit_mac {
+        return Some(mac.to_string());
+    }
+    let idx = *state.bt_cycle.read().await;
+    bt_state
+        .active_device(idx)
+        .map(|d| d.device_address.clone())
+}
+
+/// Find a device in the current state by MAC.
+fn find_device<'a>(bt_state: &'a BtState, mac: &str) -> Option<&'a BtDeviceInfo> {
+    bt_state.devices.iter().find(|d| d.device_address == mac)
+}
+
 pub struct BtModule;
 
 impl WaybarModule for BtModule {
@@ -129,12 +151,10 @@ impl WaybarModule for BtModule {
         state: &AppReceivers,
         args: &[&str],
     ) -> FluxoResult<WaybarOutput> {
-        let action = args.first().cloned().unwrap_or("show").to_string();
-        let args = args.iter().map(|s| s.to_string()).collect::<Vec<_>>();
-
+        let action = args.first().cloned().unwrap_or("show");
         let bt_state = state.bluetooth.borrow().clone();
 
-        match action.as_str() {
+        match action {
             "connect" => {
                 if let Some(mac) = args.get(1) {
                     if let Ok(session) = bluer::Session::new().await
@@ -148,77 +168,125 @@ impl WaybarModule for BtModule {
                 }
                 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));
-                        }
+            "disconnect" => {
+                let target_mac = resolve_target_mac(&bt_state, state, args.get(1).copied()).await;
+                if let Some(mac) = target_mac {
+                    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.disconnect().await;
                     }
-                }
-                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?;
                     trigger_robust_poll(state.clone());
                 }
                 return Ok(WaybarOutput::default());
             }
-            "get_modes" if bt_state.connected => {
-                let plugin = PLUGINS
-                    .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?
-                } else {
-                    vec![]
-                };
+            "cycle" => {
+                let count = bt_state.devices.len();
+                if count > 1 {
+                    let mut idx = state.bt_cycle.write().await;
+                    *idx = (*idx + 1) % count;
+                }
+                let _ = state.bt_force_poll.try_send(());
+                return Ok(WaybarOutput::default());
+            }
+            "menu_data" => {
+                let mut lines = Vec::new();
+
+                // Connected devices
+                for dev in &bt_state.devices {
+                    lines.push(format!(
+                        "CONNECTED:{}|{}",
+                        dev.device_alias, dev.device_address
+                    ));
+                }
+
+                // Paired-but-not-connected devices
+                if let Ok(session) = bluer::Session::new().await
+                    && let Ok(adapter) = session.default_adapter().await
+                    && let Ok(addresses) = adapter.device_addresses().await
+                {
+                    let connected_macs: std::collections::HashSet<&str> = bt_state
+                        .devices
+                        .iter()
+                        .map(|d| d.device_address.as_str())
+                        .collect();
+
+                    for addr in addresses {
+                        let addr_str = addr.to_string();
+                        if connected_macs.contains(addr_str.as_str()) {
+                            continue;
+                        }
+                        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());
+                            lines.push(format!("PAIRED:{}|{}", alias, addr_str));
+                        }
+                    }
+                }
+
                 return Ok(WaybarOutput {
-                    text: modes.join("\n"),
+                    text: lines.join("\n"),
                     ..Default::default()
                 });
             }
-            "set_mode" if bt_state.connected => {
-                if let Some(mode) = args.get(1) {
+            "get_modes" => {
+                let target_mac = resolve_target_mac(&bt_state, state, args.get(1).copied()).await;
+                if let Some(mac) = target_mac
+                    && let Some(dev) = find_device(&bt_state, &mac)
+                {
                     let plugin = PLUGINS
                         .iter()
-                        .find(|p| p.can_handle(&bt_state.device_alias, &bt_state.device_address));
+                        .find(|p| p.can_handle(&dev.device_alias, &dev.device_address));
                     if let Some(p) = plugin {
-                        p.set_mode(mode, &bt_state.device_address, state).await?;
+                        let modes = p.get_modes(&mac, state).await?;
+                        return Ok(WaybarOutput {
+                            text: modes.join("\n"),
+                            ..Default::default()
+                        });
+                    }
+                }
+                return Ok(WaybarOutput::default());
+            }
+            "set_mode" => {
+                if let Some(mode) = args.get(1) {
+                    let target_mac =
+                        resolve_target_mac(&bt_state, state, args.get(2).copied()).await;
+                    if let Some(mac) = target_mac
+                        && let Some(dev) = find_device(&bt_state, &mac)
+                    {
+                        let plugin = PLUGINS
+                            .iter()
+                            .find(|p| p.can_handle(&dev.device_alias, &dev.device_address));
+                        if let Some(p) = plugin {
+                            p.set_mode(mode, &mac, state).await?;
+                            trigger_robust_poll(state.clone());
+                        }
+                    }
+                }
+                return Ok(WaybarOutput::default());
+            }
+            "cycle_mode" => {
+                let target_mac = resolve_target_mac(&bt_state, state, args.get(1).copied()).await;
+                if let Some(mac) = target_mac
+                    && let Some(dev) = find_device(&bt_state, &mac)
+                {
+                    let plugin = PLUGINS
+                        .iter()
+                        .find(|p| p.can_handle(&dev.device_alias, &dev.device_address));
+                    if let Some(p) = plugin {
+                        p.cycle_mode(&mac, state).await?;
                         trigger_robust_poll(state.clone());
                     }
                 }
                 return Ok(WaybarOutput::default());
             }
-            "show" => {}
             _ => {}
         }
 
+        // "show" and fallthrough
         if !bt_state.adapter_powered {
             return Ok(WaybarOutput {
                 text: config.bt.format_disabled.clone(),
@@ -228,22 +296,23 @@ impl WaybarModule for BtModule {
             });
         }
 
-        if bt_state.connected {
+        let cycle_idx = *state.bt_cycle.read().await;
+        if let Some(dev) = bt_state.active_device(cycle_idx) {
             let mut tokens: Vec<(String, TokenValue)> = vec![
                 (
                     "alias".to_string(),
-                    TokenValue::String(bt_state.device_alias.clone()),
+                    TokenValue::String(dev.device_alias.clone()),
                 ),
                 (
                     "mac".to_string(),
-                    TokenValue::String(bt_state.device_address.clone()),
+                    TokenValue::String(dev.device_address.clone()),
                 ),
             ];
 
             let mut class = vec!["connected".to_string()];
             let mut has_plugin = false;
 
-            for (k, v) in &bt_state.plugin_data {
+            for (k, v) in &dev.plugin_data {
                 if k == "plugin_class" {
                     class.push(v.clone());
                     has_plugin = true;
@@ -263,10 +332,9 @@ impl WaybarModule for BtModule {
             let text = format_template(format, &tokens);
             let tooltip = format!(
                 "{} | MAC: {}\nBattery: {}",
-                bt_state.device_alias,
-                bt_state.device_address,
-                bt_state
-                    .battery_percentage
+                dev.device_alias,
+                dev.device_address,
+                dev.battery_percentage
                     .map(|b| format!("{}%", b))
                     .unwrap_or_else(|| "N/A".to_string())
             );
@@ -275,7 +343,7 @@ impl WaybarModule for BtModule {
                 text,
                 tooltip: Some(tooltip),
                 class: Some(class.join(" ")),
-                percentage: bt_state.battery_percentage,
+                percentage: dev.battery_percentage,
             })
         } else {
             Ok(WaybarOutput {

src/modules/dnd.rs

@@ -5,8 +5,9 @@ use crate::output::WaybarOutput;
 use crate::state::{AppReceivers, DndState};
 use futures::StreamExt;
 use tokio::sync::watch;
+use tokio::time::Duration;
 use tracing::{debug, error, info};
-use zbus::{Connection, fdo::PropertiesProxy, proxy};
+use zbus::{Connection, fdo::PropertiesProxy, names::InterfaceName, proxy};
 
 pub struct DndModule;
 
@@ -29,19 +30,19 @@ impl WaybarModule for DndModule {
                     })?;
 
             // Try toggling SwayNC
-            if let Ok(proxy) = SwayncControlProxy::new(&connection).await {
-                if let Ok(is_dnd) = proxy.dnd().await {
-                    let _ = proxy.set_dnd(!is_dnd).await;
-                    return Ok(WaybarOutput::default());
-                }
+            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 {
-                if let Ok(is_paused) = proxy.paused().await {
-                    let _ = proxy.set_paused(!is_paused).await;
-                    return Ok(WaybarOutput::default());
-                }
+            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 {
@@ -117,58 +118,96 @@ impl DndDaemon {
 
         info!("Connected to D-Bus for DND monitoring");
 
-        // Try SwayNC
-        if let Ok(proxy) = SwayncControlProxy::new(&connection).await {
-            if let Ok(is_dnd) = proxy.dnd().await {
-                debug!("Found SwayNC, using it for DND state.");
-                let _ = tx.send(DndState { is_dnd });
+        // Try SwayNC first (signal-based)
+        if let Ok(proxy) = SwayncControlProxy::new(&connection).await
+            && let Ok(is_dnd) = proxy.dnd().await
+        {
+            debug!("Found SwayNC, using signal-based DND monitoring");
+            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 });
-                        }
+            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 });
                     }
                 }
             }
+
+            return Err(anyhow::anyhow!("SwayNC DND stream ended"));
         }
 
-        // Try Dunst
-        if let Ok(proxy) = DunstControlProxy::new(&connection).await {
-            if let Ok(is_dnd) = proxy.paused().await {
-                debug!("Found Dunst, using it for DND state.");
-                let _ = tx.send(DndState { is_dnd });
+        // Try Dunst (polling via raw D-Bus Properties.Get for maximum compatibility)
+        let props_proxy = PropertiesProxy::builder(&connection)
+            .destination("org.freedesktop.Notifications")?
+            .path("/org/freedesktop/Notifications")?
+            .build()
+            .await;
 
-                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 });
+        match &props_proxy {
+            Ok(_) => debug!("Created Properties proxy for Dunst"),
+            Err(e) => debug!("Failed to create Properties proxy for Dunst: {}", e),
+        }
+
+        if let Ok(props) = props_proxy {
+            // Read paused property via raw Properties.Get
+            let initial = props
+                .get(
+                    InterfaceName::from_static_str_unchecked("org.dunstproject.cmd0"),
+                    "paused",
+                )
+                .await;
+
+            match &initial {
+                Ok(_) => debug!("Successfully read Dunst paused property"),
+                Err(e) => debug!("Failed to read Dunst paused property: {}", e),
+            }
+
+            if let Ok(value) = initial
+                && let Ok(is_paused) = bool::try_from(&*value)
+            {
+                info!("Found Dunst, using polling-based DND monitoring");
+                let _ = tx.send(DndState { is_dnd: is_paused });
+
+                loop {
+                    tokio::time::sleep(Duration::from_secs(2)).await;
+                    match props
+                        .get(
+                            InterfaceName::from_static_str_unchecked("org.dunstproject.cmd0"),
+                            "paused",
+                        )
+                        .await
+                    {
+                        Ok(value) => {
+                            if let Ok(is_paused) = bool::try_from(&*value) {
+                                let current = tx.borrow().is_dnd;
+                                if current != is_paused {
+                                    let _ = tx.send(DndState { is_dnd: is_paused });
+                                }
+                            }
+                        }
+                        Err(e) => {
+                            debug!("Dunst paused() poll failed: {}", e);
+                            break;
                         }
                     }
                 }
+
+                return Err(anyhow::anyhow!("Dunst connection lost"));
             }
         }
 
-        Err(anyhow::anyhow!("DND stream ended or daemon not found"))
+        Err(anyhow::anyhow!(
+            "No supported notification daemon found (tried SwayNC, Dunst)"
+        ))
     }
 }

src/modules/mpris.rs

@@ -2,12 +2,66 @@ use crate::config::Config;
 use crate::error::Result;
 use crate::modules::WaybarModule;
 use crate::output::WaybarOutput;
-use crate::state::{AppReceivers, MprisState};
+use crate::state::{AppReceivers, MprisScrollState, MprisState};
 use crate::utils::{TokenValue, format_template};
-use tokio::sync::watch;
+use std::sync::Arc;
+use tokio::sync::{RwLock, watch};
+use tokio::time::Duration;
 use tracing::{debug, info};
 use zbus::{Connection, proxy};
 
+fn format_mpris_text(format: &str, mpris: &MprisState) -> (String, &'static str) {
+    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(
+        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())),
+        ],
+    );
+
+    (text, class)
+}
+
+fn apply_scroll_window(full_text: &str, max_len: usize, offset: usize, separator: &str) -> String {
+    let char_count = full_text.chars().count();
+    let total_len = char_count + separator.chars().count();
+    let offset = offset % total_len;
+    full_text
+        .chars()
+        .chain(separator.chars())
+        .cycle()
+        .skip(offset)
+        .take(max_len)
+        .collect()
+}
+
+fn truncate_with_ellipsis(text: &str, max_len: usize) -> String {
+    let char_count = text.chars().count();
+    if char_count <= max_len {
+        return text.to_string();
+    }
+    let truncated: String = text.chars().take(max_len.saturating_sub(3)).collect();
+    format!("{}...", truncated)
+}
+
 pub struct MprisModule;
 
 impl WaybarModule for MprisModule {
@@ -28,32 +82,26 @@ impl WaybarModule for MprisModule {
             });
         }
 
-        let status_icon = if mpris.is_playing {
-            "󰏤"
-        } else if mpris.is_paused {
-            "󰐊"
-        } else {
-            "󰓛"
-        };
+        let (full_text, class) = format_mpris_text(&config.mpris.format, &mpris);
 
-        let class = if mpris.is_playing {
-            "playing"
-        } else if mpris.is_paused {
-            "paused"
+        let text = if config.mpris.scroll {
+            if let Some(max_len) = config.mpris.max_length {
+                let scroll = state.mpris_scroll.read().await;
+                apply_scroll_window(
+                    &full_text,
+                    max_len,
+                    scroll.offset,
+                    &config.mpris.scroll_separator,
+                )
+            } else {
+                full_text.clone()
+            }
+        } else if let Some(max_len) = config.mpris.max_length {
+            truncate_with_ellipsis(&full_text, max_len)
         } else {
-            "stopped"
+            full_text.clone()
         };
 
-        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)),
@@ -63,6 +111,54 @@ impl WaybarModule for MprisModule {
     }
 }
 
+pub async fn mpris_scroll_ticker(
+    config: Arc<RwLock<Config>>,
+    mut mpris_rx: watch::Receiver<MprisState>,
+    scroll_state: Arc<RwLock<MprisScrollState>>,
+    tick_tx: watch::Sender<u64>,
+) {
+    let mut generation: u64 = 0;
+    let mut last_track_key = String::new();
+
+    loop {
+        let mpris = mpris_rx.borrow_and_update().clone();
+        let cfg = config.read().await;
+        let scroll_enabled = cfg.mpris.scroll;
+        let has_max_length = cfg.mpris.max_length.is_some();
+        let scroll_speed = cfg.mpris.scroll_speed;
+        let format_str = cfg.mpris.format.clone();
+        drop(cfg);
+
+        let (full_text, _) = format_mpris_text(&format_str, &mpris);
+        let track_key = format!("{}|{}|{}", mpris.artist, mpris.title, mpris.album);
+
+        if track_key != last_track_key {
+            let mut state = scroll_state.write().await;
+            state.offset = 0;
+            state.full_text = full_text.clone();
+            last_track_key = track_key;
+            generation += 1;
+            let _ = tick_tx.send(generation);
+        }
+
+        if scroll_enabled && has_max_length && mpris.is_playing {
+            tokio::time::sleep(Duration::from_millis(scroll_speed)).await;
+            let mut state = scroll_state.write().await;
+            state.offset += 1;
+            state.full_text = full_text;
+            drop(state);
+            generation += 1;
+            let _ = tick_tx.send(generation);
+            continue;
+        }
+
+        // Not scrolling — wait for next state change
+        if mpris_rx.changed().await.is_err() {
+            break;
+        }
+    }
+}
+
 pub struct MprisDaemon;
 
 #[proxy(

src/registry.rs

@@ -12,6 +12,10 @@ pub async fn dispatch(
     #[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" => {

src/signaler.rs

@@ -175,6 +175,13 @@ impl WaybarSignaler {
             #[cfg(feature = "mod-dbus")]
             let mpris_changed = receivers.mpris.changed();
 
+            #[cfg(not(feature = "mod-dbus"))]
+            let mpris_scroll_tick_changed = std::future::pending::<
+                std::result::Result<(), tokio::sync::watch::error::RecvError>,
+            >();
+            #[cfg(feature = "mod-dbus")]
+            let mpris_scroll_tick_changed = receivers.mpris_scroll_tick.changed();
+
             tokio::select! {
                 res = net_changed, if signals.network.is_some() => {
                     if res.is_ok() { check_and_signal!("net", signals.network); }
@@ -215,6 +222,10 @@ impl WaybarSignaler {
                 res = mpris_changed, if signals.mpris.is_some() => {
                     if res.is_ok() { check_and_signal!("mpris", signals.mpris); }
                 }
+                res = mpris_scroll_tick_changed, if signals.mpris.is_some() => {
+                    if res.is_ok()
+                        && let Some(sig) = signals.mpris { self.send_signal(sig); }
+                }
                 _ = sleep(Duration::from_secs(5)) => {
                     // loop and refresh config
                 }

src/state.rs

@@ -20,6 +20,8 @@ pub struct AppReceivers {
     pub disks: watch::Receiver<Vec<DiskInfo>>,
     #[cfg(feature = "mod-bt")]
     pub bluetooth: watch::Receiver<BtState>,
+    #[cfg(feature = "mod-bt")]
+    pub bt_cycle: Arc<RwLock<usize>>,
     #[cfg(feature = "mod-audio")]
     pub audio: watch::Receiver<AudioState>,
     #[cfg(feature = "mod-dbus")]
@@ -30,6 +32,10 @@ pub struct AppReceivers {
     pub keyboard: watch::Receiver<KeyboardState>,
     #[cfg(feature = "mod-dbus")]
     pub dnd: watch::Receiver<DndState>,
+    #[cfg(feature = "mod-dbus")]
+    pub mpris_scroll: Arc<RwLock<MprisScrollState>>,
+    #[cfg(feature = "mod-dbus")]
+    pub mpris_scroll_tick: watch::Receiver<u64>,
     pub health: Arc<RwLock<HashMap<String, ModuleHealth>>>,
     #[cfg(feature = "mod-bt")]
     pub bt_force_poll: mpsc::Sender<()>,
@@ -72,15 +78,29 @@ pub struct AudioSourceInfo {
 }
 
 #[derive(Default, Clone)]
-pub struct BtState {
-    pub connected: bool,
-    pub adapter_powered: bool,
+pub struct BtDeviceInfo {
     pub device_alias: String,
     pub device_address: String,
     pub battery_percentage: Option<u8>,
     pub plugin_data: Vec<(String, String)>,
 }
 
+#[derive(Default, Clone)]
+pub struct BtState {
+    pub adapter_powered: bool,
+    pub devices: Vec<BtDeviceInfo>,
+}
+
+impl BtState {
+    pub fn active_device(&self, index: usize) -> Option<&BtDeviceInfo> {
+        if self.devices.is_empty() {
+            None
+        } else {
+            Some(&self.devices[index % self.devices.len()])
+        }
+    }
+}
+
 #[derive(Default, Clone)]
 pub struct DiskInfo {
     pub mount_point: String,
@@ -169,6 +189,12 @@ pub struct BacklightState {
     pub percentage: u8,
 }
 
+#[derive(Default, Clone)]
+pub struct MprisScrollState {
+    pub offset: usize,
+    pub full_text: String,
+}
+
 #[derive(Default, Clone)]
 pub struct MprisState {
     pub is_playing: bool,
@@ -285,6 +311,8 @@ pub fn mock_state(state: AppState) -> MockState {
             disks: disks_rx,
             #[cfg(feature = "mod-bt")]
             bluetooth: bt_rx,
+            #[cfg(feature = "mod-bt")]
+            bt_cycle: Arc::new(RwLock::new(0usize)),
             #[cfg(feature = "mod-audio")]
             audio: audio_rx,
             #[cfg(feature = "mod-dbus")]
@@ -295,6 +323,13 @@ pub fn mock_state(state: AppState) -> MockState {
             keyboard: keyboard_rx,
             #[cfg(feature = "mod-dbus")]
             dnd: dnd_rx,
+            #[cfg(feature = "mod-dbus")]
+            mpris_scroll: Arc::new(RwLock::new(MprisScrollState::default())),
+            #[cfg(feature = "mod-dbus")]
+            mpris_scroll_tick: {
+                let (_, rx) = watch::channel(0u64);
+                rx
+            },
             health: Arc::new(RwLock::new(state.health)),
             #[cfg(feature = "mod-bt")]
             bt_force_poll: bt_force_tx,