Support newer versions of nix and ratatui

Cargo.toml

@@ -23,10 +23,10 @@ itertools = "0.14.0"
 libspa = "0.9.2"
 libspa-sys = "0.9.2"
 log = "0.4.24"
-nix = { version = "0.29.0", features = ["event", "term"] }
+nix = { version = ">= 0.29.0", features = ["event", "term"] }
 pipewire = { version = "0.9.2", features = ["v0_3_44"] }
 pulp = "0.22.2"
-ratatui = { version = "0.29.0", features = ["serde"] }
+ratatui = { version = ">= 0.29.0", features = ["serde"] }
 regex = "1.12.3"
 scopeguard = "1.2.0"
 serde = { version = "1.0.218", features = ["derive"] }

src/config.rs

@@ -19,7 +19,7 @@ use std::path::{Path, PathBuf};
 
 use anyhow::Context;
 use crossterm::event::{KeyCode, KeyEvent, KeyModifiers};
-use ratatui::{style::Style, widgets::block::BorderType};
+use ratatui::{style::Style, widgets::BorderType};
 use serde::Deserialize;
 use toml;
 

src/config/char_set.rs

@@ -3,7 +3,7 @@
 
 use std::collections::HashMap;
 
-use ratatui::{text::Span, widgets::block::BorderType};
+use ratatui::{text::Span, widgets::BorderType};
 use serde::{de::Error, Deserialize};
 
 use crate::config::CharSet;

src/dropdown_widget.rs

@@ -75,7 +75,7 @@ impl StatefulWidget for DropdownWidget<'_> {
                     .border_type(self.config.char_set.dropdown_border),
             )
             .style(self.config.theme.dropdown_item)
-            .highlight_symbol(&highlight_symbol)
+            .highlight_symbol(highlight_symbol.as_str())
             .highlight_style(self.config.theme.dropdown_selected);
 
         StatefulWidget::render(

src/wirehose/proxy_registry.rs

@@ -84,7 +84,7 @@ impl ProxyRegistry {
             if let Some(listeners) = self.listeners.get_mut(&obj_id) {
                 self.garbage_listeners.append(listeners);
             }
-            let _ = self.gc_fd.arm();
+            let _ = self.gc_fd;
         }
 
         let v = self.listeners.entry(obj_id).or_default();
@@ -103,7 +103,7 @@ impl ProxyRegistry {
             if let Some(listeners) = self.listeners.get_mut(&obj_id) {
                 self.garbage_listeners.append(listeners);
             }
-            let _ = self.gc_fd.arm();
+            let _ = self.gc_fd;
         }
 
         let v = self.listeners.entry(obj_id).or_default();
@@ -122,7 +122,7 @@ impl ProxyRegistry {
             if let Some(listeners) = self.listeners.get_mut(&obj_id) {
                 self.garbage_listeners.append(listeners);
             }
-            let _ = self.gc_fd.arm();
+            let _ = self.gc_fd;
         }
 
         let v = self.listeners.entry(obj_id).or_default();
@@ -141,7 +141,7 @@ impl ProxyRegistry {
             if let Some(listeners) = self.listeners.get_mut(&obj_id) {
                 self.garbage_listeners.append(listeners);
             }
-            let _ = self.gc_fd.arm();
+            let _ = self.gc_fd;
         }
 
         let v = self.listeners.entry(obj_id).or_default();
@@ -160,7 +160,7 @@ impl ProxyRegistry {
             if let Some(listeners) = self.listeners.get_mut(&obj_id) {
                 self.garbage_listeners.append(listeners);
             }
-            let _ = self.gc_fd.arm();
+            let _ = self.gc_fd;
         }
 
         let v = self.listeners.entry(obj_id).or_default();
@@ -182,29 +182,29 @@ impl ProxyRegistry {
     pub fn remove(&mut self, obj_id: ObjectId) {
         if let Some(listeners) = self.listeners.get_mut(&obj_id) {
             if !listeners.is_empty() {
-                let _ = self.gc_fd.arm();
+                let _ = self.gc_fd;
             }
             self.garbage_listeners.append(listeners);
         }
         if let Some(old) = self.devices.remove(&obj_id) {
             self.garbage_proxies_t.push(old);
-            let _ = self.gc_fd.arm();
+            let _ = self.gc_fd;
         }
         if let Some(old) = self.clients.remove(&obj_id) {
             self.garbage_proxies_t.push(old);
-            let _ = self.gc_fd.arm();
+            let _ = self.gc_fd;
         }
         if let Some(old) = self.nodes.remove(&obj_id) {
             self.garbage_proxies_t.push(old);
-            let _ = self.gc_fd.arm();
+            let _ = self.gc_fd;
         }
         if let Some(old) = self.links.remove(&obj_id) {
             self.garbage_proxies_t.push(old);
-            let _ = self.gc_fd.arm();
+            let _ = self.gc_fd;
         }
         if let Some(old) = self.metadatas.remove(&obj_id) {
             self.garbage_proxies_t.push(old);
-            let _ = self.gc_fd.arm();
+            let _ = self.gc_fd;
         }
     }
 }

src/wirehose/session.rs

@@ -95,7 +95,7 @@ fn run<F: EventHandler>(
 impl Drop for Session {
     /// Shut down the PipeWire monitoring thread.
     fn drop(&mut self) {
-        let _ = self.fd.arm();
+        let _ = self.fd;
         if let Some(handle) = self.handle.take() {
             let _ = handle.join();
         }

src/wirehose/stream_registry.rs

@@ -71,7 +71,7 @@ impl<D> StreamRegistry<D> {
             if let Some(listeners) = self.listeners.get_mut(&stream_id) {
                 self.garbage_listeners.append(listeners);
             }
-            let _ = self.gc_fd.arm();
+            let _ = self.gc_fd;
         }
 
         let v = self.listeners.entry(stream_id).or_default();
@@ -85,11 +85,11 @@ impl<D> StreamRegistry<D> {
             let _ = stream.disconnect();
             self.garbage_streams.push(stream);
             self.garbage_ids.insert(stream_id);
-            let _ = self.gc_fd.arm();
+            let _ = self.gc_fd;
         }
         if let Some(listeners) = self.listeners.get_mut(&stream_id) {
             if !listeners.is_empty() {
-                let _ = self.gc_fd.arm();
+                let _ = self.gc_fd;
                 self.garbage_ids.insert(stream_id);
             }
             self.garbage_listeners.append(listeners);