Skip to content

Commit

Permalink
Merge pull request #831 from JakeStanger/feat/sysinfo-overhaul
Browse files Browse the repository at this point in the history
feat(sysinfo): overhaul to add aggregate/unit/formatting support
  • Loading branch information
JakeStanger authored Feb 15, 2025
2 parents 49ab7e0 + 01de0ac commit 7c7b6c7
Show file tree
Hide file tree
Showing 14 changed files with 1,635 additions and 591 deletions.
105 changes: 68 additions & 37 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ keyboard = ["dep:input", "dep:evdev-rs", "dep:libc", "dep:nix"]

launcher = []

music = ["regex"]
music = ["dep:regex"]
"music+all" = ["music", "music+mpris", "music+mpd"]
"music+mpris" = ["music", "mpris"]
"music+mpd" = ["music", "mpd-utils"]
Expand All @@ -72,7 +72,7 @@ network_manager = ["futures-lite", "futures-signals", "zbus"]

notifications = ["zbus"]

sys_info = ["sysinfo", "regex"]
sys_info = ["dep:sysinfo"]

tray = ["system-tray"]

Expand Down Expand Up @@ -148,12 +148,15 @@ libc = { version = "0.2.164", optional = true }
# music
mpd-utils = { version = "0.2.1", optional = true }
mpris = { version = "2.0.1", optional = true }
regex = { version = "1.11.1", default-features = false, features = [
"std",
], optional = true }

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

# sys_info
sysinfo = { version = "0.29.11", optional = true }
sysinfo = { version = "0.33.1", optional = true }

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

0 comments on commit 7c7b6c7

Please sign in to comment.