diff --git a/Cargo.lock b/Cargo.lock index ba5a25d12..d5a0bf04f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2702,7 +2702,7 @@ dependencies = [ "serde_yaml 0.9.34+deprecated", "shadow-rs", "strum", - "sysinfo 0.30.13", + "sysinfo", "tracing", "tracing-appender", "tracing-subscriber", @@ -2743,7 +2743,7 @@ dependencies = [ "serde_json_lenient", "serde_yaml 0.8.26", "starship-battery", - "sysinfo 0.31.4", + "sysinfo", "tracing", "tracing-appender", "tracing-subscriber", @@ -2768,7 +2768,7 @@ dependencies = [ "egui_extras", "komorebi-client", "random_word", - "serde_json", + "serde_json_lenient", "windows 0.54.0", ] @@ -2778,7 +2778,7 @@ version = "0.1.29" dependencies = [ "base16-egui-themes", "catppuccin-egui", - "egui", + "eframe", "schemars", "serde", ] @@ -2804,7 +2804,7 @@ dependencies = [ "serde_json_lenient", "serde_yaml 0.9.34+deprecated", "shadow-rs", - "sysinfo 0.30.13", + "sysinfo", "thiserror", "uds_windows", "which", @@ -4735,9 +4735,9 @@ dependencies = [ [[package]] name = "shadow-rs" -version = "0.34.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69fe0bac8a8752586a618a1c80d01d8ca5d40fce4f6077fbc851e48dcbdb90df" +checksum = "fca0e9bdc073d7173ba993fb7886477af5df75588b57afcb4b96f21911ab0bfa" dependencies = [ "const_format", "git2", @@ -5039,21 +5039,6 @@ dependencies = [ "futures-core", ] -[[package]] -name = "sysinfo" -version = "0.30.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" -dependencies = [ - "cfg-if 1.0.0", - "core-foundation-sys", - "libc", - "ntapi", - "once_cell", - "rayon", - "windows 0.52.0", -] - [[package]] name = "sysinfo" version = "0.31.4" @@ -5590,15 +5575,15 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-xid" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "unsafe-libyaml" diff --git a/Cargo.toml b/Cargo.toml index 25c754544..22bcf21c6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,23 +7,37 @@ members = [ "komorebi-gui", "komorebic", "komorebic-no-console", - "komorebi-bar" -, "komorebi-themes"] + "komorebi-bar", + "komorebi-themes" +] [workspace.dependencies] +clap = { version = "4", features = ["derive", "wrap_help"] } +chrono = "0.4" +crossbeam-channel = "0.5" +crossbeam-utils = "0.8" color-eyre = "0.6" +eframe = "0.28" +egui_extras = "0.28" dirs = "5" dunce = "1" +hotwatch = "0.5" schemars = "0.8" +lazy_static = "1" serde = { version = "1", features = ["derive"] } serde_json = { package = "serde_json_lenient", version = "0.2" } serde_yaml = "0.9" -sysinfo = "0.30" +tracing = "0.1" +tracing-appender = "0.2" +tracing-subscriber = { version = "0.3", features = ["env-filter"] } +paste = "1" +sysinfo = "0.31" uds_windows = "1" win32-display-data = { git = "https://github.com/LGUG2Z/win32-display-data", rev = "32a45cebf132c3d651ee22c0c40033a6b7edc945" } windows-implement = { version = "0.53" } windows-interface = { version = "0.53" } -shadow-rs = "0.34" +shadow-rs = "0.35" +which = "6" [workspace.dependencies.windows] version = "0.54" diff --git a/komorebi-bar/Cargo.toml b/komorebi-bar/Cargo.toml index 4eaef4308..79dcac8b2 100644 --- a/komorebi-bar/Cargo.toml +++ b/komorebi-bar/Cargo.toml @@ -9,16 +9,16 @@ edition = "2021" komorebi-client = { path = "../komorebi-client" } komorebi-themes = { path = "../komorebi-themes" } -chrono = "0.4" -clap = { version = "4", features = ["derive", "wrap_help"] } -color-eyre = "0.6" -crossbeam-channel = "0.5" +chrono = { workspace = true } +clap = { workspace = true } +color-eyre = { workspace = true } +crossbeam-channel = { workspace = true } dirs = { workspace = true } -dunce = "1" -eframe = "0.28" +dunce = { workspace = true } +eframe = { workspace = true } egui-phosphor = "0.6.0" font-loader = "0.11" -hotwatch = "0.5" +hotwatch = { workspace = true } image = "0.25" netdev = "0.30" num = "0.4.3" @@ -29,9 +29,9 @@ serde = { workspace = true } serde_json = { workspace = true } serde_yaml = "0.8" starship-battery = "0.10" -sysinfo = "0.31" -tracing = "0.1" -tracing-appender = "0.2" -tracing-subscriber = { version = "0.3", features = ["env-filter"] } +sysinfo = { workspace = true } +tracing = { workspace = true } +tracing-appender = { workspace = true } +tracing-subscriber = { workspace = true } windows = { workspace = true } windows-icons = { git = "https://github.com/LGUG2Z/windows-icons", rev = "d67cc9920aa9b4883393e411fb4fa2ddd4c498b5" } \ No newline at end of file diff --git a/komorebi-client/Cargo.toml b/komorebi-client/Cargo.toml index 3575eba10..3198b6071 100644 --- a/komorebi-client/Cargo.toml +++ b/komorebi-client/Cargo.toml @@ -7,5 +7,6 @@ edition = "2021" [dependencies] komorebi = { path = "../komorebi" } -uds_windows = "1" + +uds_windows = { workspace = true } serde_json = { workspace = true } diff --git a/komorebi-gui/Cargo.toml b/komorebi-gui/Cargo.toml index 817faa69b..4ef5b822a 100644 --- a/komorebi-gui/Cargo.toml +++ b/komorebi-gui/Cargo.toml @@ -6,9 +6,10 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -egui_extras = { version = "0.28" } -eframe = "0.28" komorebi-client = { path = "../komorebi-client" } -serde_json = "1" + +eframe = { workspace = true } +egui_extras = { workspace = true } random_word = { version = "0.4.3", features = ["en"] } +serde_json = { workspace = true } windows = { workspace = true } \ No newline at end of file diff --git a/komorebi-themes/Cargo.toml b/komorebi-themes/Cargo.toml index b01f8ceeb..493ff2eef 100644 --- a/komorebi-themes/Cargo.toml +++ b/komorebi-themes/Cargo.toml @@ -6,6 +6,6 @@ edition = "2021" [dependencies] base16-egui-themes = { git = "https://github.com/LGUG2Z/base16-egui-themes", rev = "a2c48f45782c5604bf5482d3873021a9fe45ea1a" } catppuccin-egui = { version = "5.1", default-features = false, features = ["egui28"] } -egui = "0.28" -serde = { workspace = true } +eframe = { workspace = true } schemars = { workspace = true } +serde = { workspace = true } diff --git a/komorebi-themes/src/lib.rs b/komorebi-themes/src/lib.rs index c6ec7b645..f87fef991 100644 --- a/komorebi-themes/src/lib.rs +++ b/komorebi-themes/src/lib.rs @@ -7,7 +7,7 @@ use serde::Serialize; pub use base16_egui_themes::Base16; pub use catppuccin_egui; -pub use egui::Color32; +pub use eframe::egui::Color32; #[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)] #[serde(tag = "type")] diff --git a/komorebi/Cargo.toml b/komorebi/Cargo.toml index 3f97edaca..6aca5e26c 100644 --- a/komorebi/Cargo.toml +++ b/komorebi/Cargo.toml @@ -14,35 +14,36 @@ edition = "2021" komorebi-themes = { path = "../komorebi-themes" } bitflags = { version = "2", features = ["serde"] } -clap = { version = "4", features = ["derive"] } +clap = { workspace = true } color-eyre = { workspace = true } -crossbeam-channel = "0.5" -crossbeam-utils = "0.8" +crossbeam-channel = { workspace = true } +crossbeam-utils = { workspace = true } ctrlc = { version = "3", features = ["termination"] } dirs = { workspace = true } dunce = { workspace = true } getset = "0.1" hex_color = { version = "3", features = ["serde"] } -hotwatch = "0.5" -lazy_static = "1" +hotwatch = { workspace = true } +lazy_static = { workspace = true } miow = "0.6" nanoid = "0.4" net2 = "0.2" os_info = "3.8" parking_lot = "0.12" -paste = "1" +paste = { workspace = true } regex = "1" schemars = { workspace = true } -serde = { version = "1", features = ["derive"] } +serde = { workspace = true } serde_json = { workspace = true } serde_yaml = { workspace = true } +shadow-rs = { workspace = true } strum = { version = "0.26", features = ["derive"] } sysinfo = { workspace = true } -tracing = "0.1" -tracing-appender = "0.2" -tracing-subscriber = { version = "0.3", features = ["env-filter"] } -uds_windows = "1" -which = "6" +tracing = { workspace = true } +tracing-appender = { workspace = true } +tracing-subscriber = { workspace = true } +uds_windows = { workspace = true } +which = { workspace = true } widestring = "1" win32-display-data = { workspace = true } windows = { workspace = true } @@ -50,7 +51,6 @@ windows-implement = { workspace = true } windows-interface = { workspace = true } winput = "0.2" winreg = "0.52" -shadow-rs = { workspace = true } [build-dependencies] shadow-rs = { workspace = true } diff --git a/komorebi/src/main.rs b/komorebi/src/main.rs index 269c81aea..31df30c87 100644 --- a/komorebi/src/main.rs +++ b/komorebi/src/main.rs @@ -21,6 +21,7 @@ use crossbeam_utils::Backoff; use parking_lot::deadlock; use parking_lot::Mutex; use sysinfo::Process; +use sysinfo::ProcessesToUpdate; use tracing_appender::non_blocking::WorkerGuard; use tracing_subscriber::layer::SubscriberExt; use tracing_subscriber::EnvFilter; @@ -167,9 +168,9 @@ fn main() -> Result<()> { SESSION_ID.store(session_id, Ordering::SeqCst); let mut system = sysinfo::System::new_all(); - system.refresh_processes(); + system.refresh_processes(ProcessesToUpdate::All); - let matched_procs: Vec<&Process> = system.processes_by_name("komorebi.exe").collect(); + let matched_procs: Vec<&Process> = system.processes_by_name("komorebi.exe".as_ref()).collect(); if matched_procs.len() > 1 { let mut len = matched_procs.len(); diff --git a/komorebic/Cargo.toml b/komorebic/Cargo.toml index 073f9b01d..a8c44920e 100644 --- a/komorebic/Cargo.toml +++ b/komorebic/Cargo.toml @@ -13,28 +13,28 @@ edition = "2021" [dependencies] komorebi-client = { path = "../komorebi-client" } -clap = { version = "4", features = ["derive", "wrap_help"] } -chrono = "0.4" +chrono = { workspace = true } +clap = { workspace = true } color-eyre = { workspace = true } dirs = { workspace = true } dunce = { workspace = true } fs-tail = "0.1" -lazy_static = "1" +lazy_static = { workspace = true } miette = { version = "7", features = ["fancy"] } -paste = "1" +paste = { workspace = true } powershell_script = "1.0" reqwest = { version = "0.12", features = ["blocking"] } -serde = { version = "1", features = ["derive"] } +schemars = { workspace = true } +serde = { workspace = true } serde_json = { workspace = true } serde_yaml = "0.9" +shadow-rs = { workspace = true } sysinfo = { workspace = true } thiserror = "1" -uds_windows = "1" -which = "6" +uds_windows = { workspace = true } +which = { workspace = true } win32-display-data = { workspace = true } windows = { workspace = true } -shadow-rs = { workspace = true } -schemars = { workspace = true } [build-dependencies] reqwest = { version = "0.12", features = ["blocking"] } diff --git a/komorebic/src/main.rs b/komorebic/src/main.rs index 7fc030b50..0a9f5314d 100644 --- a/komorebic/src/main.rs +++ b/komorebic/src/main.rs @@ -35,6 +35,7 @@ use miette::SourceSpan; use paste::paste; use schemars::gen::SchemaSettings; use schemars::schema_for; +use sysinfo::ProcessesToUpdate; use which::which; use windows::Win32::Foundation::HWND; use windows::Win32::UI::WindowsAndMessaging::ShowWindow; @@ -1953,9 +1954,13 @@ fn main() -> Result<()> { std::thread::sleep(Duration::from_secs(3)); let mut system = sysinfo::System::new_all(); - system.refresh_processes(); + system.refresh_processes(ProcessesToUpdate::All); - if system.processes_by_name("komorebi.exe").next().is_some() { + if system + .processes_by_name("komorebi.exe".as_ref()) + .next() + .is_some() + { println!("Started!"); running = true; } else { @@ -2094,9 +2099,9 @@ Stop-Process -Name:komorebi-bar -ErrorAction SilentlyContinue send_message(&SocketMessage::Stop)?; let mut system = sysinfo::System::new_all(); - system.refresh_processes(); + system.refresh_processes(ProcessesToUpdate::All); - if system.processes_by_name("komorebi.exe").count() >= 1 { + if system.processes_by_name("komorebi.exe".as_ref()).count() >= 1 { println!("komorebi is still running, attempting to force-quit"); let script = r"