Skip to content

Commit 7c7b6c7

Browse files
authored
Merge pull request #831 from JakeStanger/feat/sysinfo-overhaul
feat(sysinfo): overhaul to add aggregate/unit/formatting support
2 parents 49ab7e0 + 01de0ac commit 7c7b6c7

File tree

14 files changed

+1635
-591
lines changed

14 files changed

+1635
-591
lines changed

Cargo.lock

+68-37
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ keyboard = ["dep:input", "dep:evdev-rs", "dep:libc", "dep:nix"]
6363

6464
launcher = []
6565

66-
music = ["regex"]
66+
music = ["dep:regex"]
6767
"music+all" = ["music", "music+mpris", "music+mpd"]
6868
"music+mpris" = ["music", "mpris"]
6969
"music+mpd" = ["music", "mpd-utils"]
@@ -72,7 +72,7 @@ network_manager = ["futures-lite", "futures-signals", "zbus"]
7272

7373
notifications = ["zbus"]
7474

75-
sys_info = ["sysinfo", "regex"]
75+
sys_info = ["dep:sysinfo"]
7676

7777
tray = ["system-tray"]
7878

@@ -148,12 +148,15 @@ libc = { version = "0.2.164", optional = true }
148148
# music
149149
mpd-utils = { version = "0.2.1", optional = true }
150150
mpris = { version = "2.0.1", optional = true }
151+
regex = { version = "1.11.1", default-features = false, features = [
152+
"std",
153+
], optional = true }
151154

152155
# network_manager
153156
futures-signals = { version = "0.3.34", optional = true }
154157

155158
# sys_info
156-
sysinfo = { version = "0.29.11", optional = true }
159+
sysinfo = { version = "0.33.1", optional = true }
157160

158161
# tray
159162
system-tray = { version = "0.7.0", features = ["dbusmenu-gtk3"], optional = true }
@@ -164,9 +167,6 @@ libpulse-binding = { version = "2.28.2", optional = true }
164167
# shared
165168
futures-lite = { version = "2.6.0", optional = true } # network_manager, upower, workspaces
166169
nix = { version = "0.29.0", optional = true, features = ["event", "fs", "poll"] } # clipboard, input
167-
regex = { version = "1.11.1", default-features = false, features = [
168-
"std",
169-
], optional = true } # music, sys_info
170170
zbus = { version = "5.5.0", default-features = false, features = ["tokio"], optional = true } # network_manager, notifications, upower
171171
swayipc-async = { version = "2.0.1", optional = true } # workspaces, keyboard
172172
hyprland = { version = "0.4.0-alpha.3", features = ["silent"], optional = true } # workspaces, keyboard

0 commit comments

Comments
 (0)