diff --git a/Cargo.lock b/Cargo.lock index d5a1c5c..09a2121 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -331,12 +331,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "dyn-clone" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f94fa09c2aeea5b8839e414b7b841bf429fd25b9c522116ac97ee87856d88b2" - [[package]] name = "either" version = "1.8.0" @@ -381,7 +375,6 @@ dependencies = [ "cairo-sys-rs", "codespan-reporting", "derive_more", - "dyn-clone", "eww_shared_util", "extend", "futures-core", @@ -397,7 +390,7 @@ dependencies = [ "libc", "log", "maplit", - "nix", + "nix 0.25.0", "notify", "once_cell", "pretty_env_logger", @@ -422,7 +415,6 @@ name = "eww_shared_util" version = "0.1.0" dependencies = [ "derive_more", - "gdk", "ref-cast", "serde", ] @@ -1103,6 +1095,20 @@ dependencies = [ "memoffset", ] +[[package]] +name = "nix" +version = "0.25.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb" +dependencies = [ + "autocfg", + "bitflags", + "cfg-if", + "libc", + "memoffset", + "pin-utils", +] + [[package]] name = "notify" version = "5.0.0-pre.14" @@ -1832,9 +1838,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.24.7" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54cb4ebf3d49308b99e6e9dc95e989e2fdbdc210e4f67c39db0bb89ba927001c" +checksum = "e08068324641dc7a50f3aa753e730594619ed9c5ba037b1b3920cb683e1a80b1" dependencies = [ "cfg-if", "core-foundation-sys", @@ -2160,7 +2166,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507" dependencies = [ "gethostname", - "nix", + "nix 0.24.2", "winapi", "winapi-wsapoll", "x11rb-protocol", @@ -2172,7 +2178,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67" dependencies = [ - "nix", + "nix 0.24.2", ] [[package]] diff --git a/crates/eww/Cargo.toml b/crates/eww/Cargo.toml index 7abdc24..3912d35 100644 --- a/crates/eww/Cargo.toml +++ b/crates/eww/Cargo.toml @@ -45,7 +45,7 @@ log = "0.4" pretty_env_logger = "0.4" libc = "0.2" once_cell = "1.8" -nix = "0.24" +nix = "0.25" smart-default = "0.6" simple-signal = "1.1" unescape = "0.1" @@ -55,9 +55,8 @@ futures-core = "0.3" futures-util = "0.3" tokio-util = "0.7" -sysinfo = "0.24" +sysinfo = "0.26" -dyn-clone = "1.0" wait-timeout = "0.2" notify = "=5.0.0-pre.14" diff --git a/crates/eww/src/config/system_stats.rs b/crates/eww/src/config/system_stats.rs index b851072..b31ffd4 100644 --- a/crates/eww/src/config/system_stats.rs +++ b/crates/eww/src/config/system_stats.rs @@ -67,7 +67,7 @@ pub fn get_temperatures() -> String { pub fn get_cpus() -> String { let mut c = SYSTEM.lock().unwrap(); - c.refresh_cpu(); + c.refresh_cpu_specifics(sysinfo::CpuRefreshKind::everything()); let cpus = c.cpus(); format!( r#"{{ "cores": [{}], "avg": {} }}"#, diff --git a/crates/eww_shared_util/Cargo.toml b/crates/eww_shared_util/Cargo.toml index 3073ea8..35b9e08 100644 --- a/crates/eww_shared_util/Cargo.toml +++ b/crates/eww_shared_util/Cargo.toml @@ -12,4 +12,3 @@ homepage = "https://github.com/elkowar/eww" serde = {version = "1.0", features = ["derive"]} derive_more = "0.99" ref-cast = "1.0.6" -gdk = { version = "*", features = ["v3_22"] }