mirror of
https://github.com/LGUG2Z/komorebi.git
synced 2026-11-14 12:53:43 +01:00
Merge of wip-u-core (kfde: komorebi-core with Container, Workspace<P>, Monitor<P>) and wip-u-pkg-mig3. Conflicts and how they were resolved: - komorebi-for-kde/Cargo.toml, komorebi-for-kde/Cargo.lock: deleted, as in the migration (one root workspace); kfde's only edit there, the komorebi-core workspace dependency, is applied as a path dependency in the crate manifest. - komorebi-for-kde/komorebi/Cargo.toml: the migration's manifest (inlined dependencies, package name komorebi-linux, [lib]/[[bin]]) plus kfde's komorebi-core dependency and the komorebi-core/schemars feature. - Cargo.lock: the migration's lock re-resolved with cargo metadata --offline: the only change is the new komorebi-core 0.1.42 entry; no version of any other package moved (compared by name/version with both parents; kfde's Windows lock differs only by the komorebi -> komorebi-windows rename). - komorebi-bar/src/widgets/komorebi.rs: deleted (the Windows bar moved to komorebi-bar/src/windows/); kfde's one-line edit (title: value.title() instead of value.title().ok()) applied to komorebi-bar/src/windows/widgets/komorebi.rs. - komorebi-for-kde/nix/root-crates.json: crates/komorebi-core added (tools/kde-closure-check now ok with 11 root crates). Gates run: tools/fast-check --since wip-u-pkg-mig3: native tests, Windows clippy -D warnings, KDE check+lib+schemas, macOS fake-CC check, nix evaluation (root and both nested flakes) PASS; KDE cargo test -p komorebi-linux -p komorebic -p komorebi-client -p komorebi-hotkeys -p komorebi-core: 902 passed, 0 failed; CLI docs oracle identical x3; bar schema harness byte-identical for both bars (its Window::title stub now returns Option); bar-core tests 3+6; kde-closure-check ok; by evaluation an edit of the Windows bar or daemon leaves the kfde derivations unchanged, a KDE edit leaves Windows unchanged, and an edit of crates/komorebi-core changes Windows and kfde but not macOS. Not run: nix builds, VM, e2e (the Windows daemon changed: kfde's e2e gate applies), any Mac run.