Merge branch 'JakeStanger:master' into minimize

.github/scripts/ubuntu_setup.sh

@@ -17,5 +17,6 @@ $SUDO apt-get update && $SUDO apt-get install --assume-yes \
 	libssl-dev${CROSS_DEB_ARCH:+:$CROSS_DEB_ARCH} \
 	libgtk-3-dev${CROSS_DEB_ARCH:+:$CROSS_DEB_ARCH} \
 	libgtk-layer-shell-dev${CROSS_DEB_ARCH:+:$CROSS_DEB_ARCH} \
+	libdbusmenu-gtk3-dev${CROSS_DEB_ARCH:+:$CROSS_DEB_ARCH} \
 	libpulse-dev${CROSS_DEB_ARCH:+:$CROSS_DEB_ARCH} \
 	libluajit-5.1-dev${CROSS_DEB_ARCH:+:$CROSS_DEB_ARCH}

.github/workflows/build.yml

@@ -55,6 +55,8 @@ jobs:
 
       - name: Clippy
         run: cargo clippy --all-targets --all-features
+        env:
+          RUSTFLAGS: '-W clippy::unwrap_used'
 
 
   build:

Cargo.toml

@@ -68,7 +68,7 @@ notifications = ["zbus"]
 
 sys_info = ["sysinfo", "regex"]
 
-tray = ["system-tray", "png"]
+tray = ["system-tray"]
 
 upower = ["upower_dbus", "zbus", "futures-lite"]
 
@@ -88,7 +88,7 @@ schema = ["dep:schemars"]
 gtk = "0.18.1"
 gtk-layer-shell = "0.8.1"
 glib = "0.18.5"
-tokio = { version = "1.41.0", features = [
+tokio = { version = "1.41.1", features = [
   "macros",
   "rt-multi-thread",
   "time",
@@ -103,7 +103,7 @@ tracing-error = { version = "0.2.0" , default-features = false }
 tracing-appender = "0.2.3"
 strip-ansi-escapes = "0.2.0"
 color-eyre = "0.6.3"
-serde = { version = "1.0.214", features = ["derive"] }
+serde = { version = "1.0.215", features = ["derive"] }
 indexmap = "2.6.0"
 dirs = "5.0.1"
 walkdir = "2.5.0"
@@ -118,10 +118,10 @@ ctrlc = "3.4.5"
 cfg-if = "1.0.0"
 
 # cli
-clap = { version = "4.5.20", optional = true, features = ["derive"] }
+clap = { version = "4.5.21", optional = true, features = ["derive"] }
 
 # ipc
-serde_json = { version = "1.0.132", optional = true }
+serde_json = { version = "1.0.133", optional = true }
 
 # http
 reqwest = { version = "0.12.9", default-features = false, features = ["default-tls", "http2"], optional = true }
@@ -148,8 +148,7 @@ futures-signals = { version = "0.3.34", optional = true }
 sysinfo = { version = "0.29.11", optional = true }
 
 # tray
-system-tray = { version = "0.3.0", optional = true }
-png = { version = "0.17.14", optional = true }
+system-tray = { version = "0.4.0", features = ["dbusmenu-gtk3"], optional = true }
 
 # upower
 upower_dbus = { version = "0.3.2", optional = true }
@@ -163,7 +162,7 @@ hyprland = { version = "0.4.0-alpha.3", features = ["silent"], optional = true }
 futures-util = { version = "0.3.31", optional = true }
 
 # shared
-futures-lite = { version = "2.4.0", optional = true } # network_manager, upower, workspaces
+futures-lite = { version = "2.5.0", optional = true } # network_manager, upower, workspaces
 regex = { version = "1.11.1", default-features = false, features = [
   "std",
 ], optional = true } # music, sys_info

docs/Compiling.md

@@ -22,6 +22,8 @@ You also need rust; only the latest stable version is supported.
 pacman -S gtk3 gtk-layer-shell
 # for http support
 pacman -S openssl
+# for tray support
+pacman -S libdbusmenu-gtk3
 # for volume support
 pacman -S libpulse
 # for lua/cairo support
@@ -34,6 +36,8 @@ pacman -S luajit lua51-lgi
 apt install build-essential libgtk-3-dev libgtk-layer-shell-dev
 # for http support
 apt install libssl-dev
+# for tray support
+apt install libdbusmenu-gtk3-dev
 # for volume support
 apt install libpulse-dev
 # for lua/cairo support
@@ -46,6 +50,8 @@ apt install luajit-dev lua-lgi
 dnf install gtk3-devel gtk-layer-shell-devel
 # for http support
 dnf install openssl-devel
+# for tray support
+dnf install libdbusmenu-gtk3-devel
 # for volume support
 dnf install pulseaudio-libs-devel
 # for lua/cairo support