build(workspace): merge the KDE and macOS crates into the root workspace

komorebi-for-kde/*, komorebi-for-mac/* crates become members of the root Cargo workspace: one
Cargo.lock (901 packages; the 859 Windows entries are unchanged, checked by name and version), the
two nested [workspace] manifests and lock files are deleted, their inherited dependencies are written
out per crate (script S/pkg-merge.py), KDE's .cargo/config.toml (COMMIT_HASH default) moves to the
root .cargo/config.toml (non-forcing, nix still wins). default-members is the Windows set, so a bare
cargo command (and crane, which passes no --workspace) builds only Windows crates; the KDE and macOS
crates are selected with -p. Crates only KDE used were re-resolved newer by cargo; pinned back to the
KDE lock (zbus, zbus_macros 6.1.0, zbus_utils 6.0.0, zruntime 0.2.1, sysinfo 0.40.0). Two small
differences remain: unicode-width 0.2.2 (KDE locked 0.2.3) and libz-sys 1.1.31 (macOS locked 1.1.30).

The root flake and the two nested flakes still read the old workspaces and do not evaluate at this
revision: they are fixed in the next one, which must land with this one (nix cannot be half-merged).
Not behaviour.

Gates run: Windows clippy --all-targets -D warnings (default-members) PASS; KDE check + 294 lib + 5
schemas PASS from the root workspace; macOS fake-CC check of the four macOS packages --locked PASS.
Not run: nix (broken until the next revision), VM, e2e. tools/fast-check now detects the merged
layout.
This commit is contained in:
LGUG2Z committed 2026-10-31 11:51:10 -07:00
1 parent 660e67b707
commit 03072f4fdb
17 files changed
+754 -14969

No files matched your search

File renamed without changes.
Generated
+618 -41
View File
File diff suppressed because it is too large. Load diff
+35
View File
@@ -22,6 +22,41 @@ members = [
"komorebi-shortcuts",
"e2e/guest/agent",
"e2e/guest/testwin",
# komorebi for KDE Plasma (Linux) and komorebi for macOS: built only on their own platform, selected
# with -p; `default-members` below is the Windows set that a bare cargo command builds
"komorebi-for-kde/komorebi",
"komorebi-for-kde/komorebic",
"komorebi-for-kde/komorebi-client",
"komorebi-for-kde/komorebi-hotkeys",
"komorebi-for-kde/version",
"komorebi-for-mac/komorebi",
"komorebi-for-mac/komorebic",
"komorebi-for-mac/komorebi-client",
"komorebi-for-mac/komorebi-bar",
"komorebi-for-mac/version",
]
default-members = [
"komorebi",
"komorebi-client",
"komorebi-gui",
"crates/komorebi-backend",
"crates/komorebi-collections",
"crates/komorebi-config",
"crates/komorebi-settings",
"komorebi-layouts",
"komorebi-scrolling",
"komorebic",
"komorebic-no-console",
"crates/komorebic-core",
"komorebi-bar",
"komorebi-themes",
"crates/komorebi-protocol",
"crates/komorebi-transport",
"crates/komorebi-bar-core",
"komorebi-shortcuts",
"e2e/guest/agent",
"e2e/guest/testwin",
]
[workspace.dependencies]
-6576
View File
File diff suppressed because it is too large. Load diff
-55
View File
@@ -1,55 +0,0 @@
[workspace]
resolver = "2"
members = [
"komorebi",
"komorebi-client",
"komorebi-hotkeys",
"komorebic",
"version",
]
[workspace.package]
version = "0.1.0"
[workspace.dependencies]
# the Backend trait every komorebi shares, and its in-memory fake
komorebi-backend = { path = "../crates/komorebi-backend" }
# upstream's layouts, at a revision of its `next` branch that has the fix for resizing a tile by
# dragging its edge (LGUG2Z/komorebi#1765), the placement helpers komorebi for KDE uses and the
# platform-free half of the rework of the Scrolling layout
komorebi-collections = { path = "../crates/komorebi-collections" }
komorebi-layouts = { path = "../komorebi-layouts", features = [
"schemars",
] }
# the model of a strip of columns that the Scrolling layout is laid out with, from the same
# revision, whose layouts re-export it as `komorebi_layouts::scrolling::model`
komorebi-scrolling = { path = "../komorebi-scrolling" }
# the wire types shared with the other komorebi daemons
komorebi-config = { path = "../crates/komorebi-config", default-features = false, features = ["schemars"] }
komorebi-settings = { path = "../crates/komorebi-settings" }
komorebi-protocol = { path = "../crates/komorebi-protocol", default-features = false, features = ["schemars"] }
komorebi-transport = { path = "../crates/komorebi-transport" }
# the themes (and the palettes made from pictures), from the same upstream revision
komorebi-themes = { path = "../komorebi-themes" }
chrono = "0.4"
clap = { version = "4", features = ["derive", "wrap_help"] }
color-eyre = "0.6"
crossbeam-channel = "0.5"
crossbeam-utils = "0.8"
dirs = "7"
hotwatch = "0.5"
lazy_static = "1"
pastey = "0.2"
schemars = "1.1"
serde = { version = "1", features = ["derive"] }
serde_json = { package = "serde_json_lenient", version = "0.2" }
shadow-rs = "2"
sysinfo = "0.40"
tracing = "0.1"
tracing-appender = "0.2"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
[workspace.metadata.crane]
name = "komorebi-workspace"
+3 -3
View File
@@ -1,13 +1,13 @@
[package]
name = "komorebi-client-linux"
version.workspace = true
version = "0.1.0"
edition = "2024"
[dependencies]
komorebi = { package = "komorebi-linux", path = "../komorebi", default-features = false }
komorebi-themes = { workspace = true }
komorebi-themes = { path = "../../komorebi-themes" }
serde_json = { workspace = true }
serde_json = { package = "serde_json_lenient", version = "0.2" }
[dev-dependencies]
parking_lot = "0.13"
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "komorebi-hotkeys"
version.workspace = true
version = "0.1.0"
description = "Reads skhd, whkd and sxhkd key binding files and plans them as KDE global shortcuts"
edition = "2024"
+24 -24
View File
@@ -1,37 +1,37 @@
[package]
name = "komorebi-linux"
version.workspace = true
version = "0.1.0"
description = "A tiling window manager for KDE Plasma"
edition = "2024"
[dependencies]
komorebi-hotkeys = { path = "../komorebi-hotkeys" }
komorebi-themes = { workspace = true }
komorebi-backend = { workspace = true }
komorebi-collections = { workspace = true }
komorebi-layouts = { workspace = true }
komorebi-scrolling = { workspace = true }
komorebi-config = { workspace = true }
komorebi-settings = { workspace = true }
komorebi-protocol = { workspace = true }
komorebi-transport = { workspace = true }
komorebi-themes = { path = "../../komorebi-themes" }
komorebi-backend = { path = "../../crates/komorebi-backend" }
komorebi-collections = { path = "../../crates/komorebi-collections" }
komorebi-layouts = { path = "../../komorebi-layouts", features = ["schemars"] }
komorebi-scrolling = { path = "../../komorebi-scrolling" }
komorebi-config = { path = "../../crates/komorebi-config", default-features = false, features = ["schemars"] }
komorebi-settings = { path = "../../crates/komorebi-settings" }
komorebi-protocol = { path = "../../crates/komorebi-protocol", default-features = false, features = ["schemars"] }
komorebi-transport = { path = "../../crates/komorebi-transport" }
version = { package = "version-linux", path = "../version" }
clap = { workspace = true }
color-eyre = { workspace = true }
crossbeam-channel = { workspace = true }
crossbeam-utils = { workspace = true }
clap = { version = "4", features = ["derive", "wrap_help"] }
color-eyre = { version = "0.6" }
crossbeam-channel = { version = "0.5" }
crossbeam-utils = { version = "0.8" }
ctrlc = { version = "3", features = ["termination"] }
dirs = { workspace = true }
hotwatch = { workspace = true }
lazy_static = { workspace = true }
dirs = { version = "7" }
hotwatch = { version = "0.5" }
lazy_static = { version = "1" }
nanoid = "0.5"
parking_lot = "0.13"
pastey = { workspace = true }
pastey = { version = "0.2" }
regex = "1"
schemars = { workspace = true, optional = true }
serde = { workspace = true }
serde_json = { workspace = true, features = ["preserve_order"] }
schemars = { version = "1.1", optional = true }
serde = { version = "1", features = ["derive"] }
serde_json = { package = "serde_json_lenient", version = "0.2", features = ["preserve_order"] }
serde_with = { version = "3", features = ["schemars_1"] }
strum = { version = "0.28", features = ["derive"] }
tokio = { version = "1", features = [
@@ -40,9 +40,9 @@ tokio = { version = "1", features = [
"sync",
"time",
] }
tracing = { workspace = true }
tracing-appender = { workspace = true }
tracing-subscriber = { workspace = true }
tracing = { version = "0.1" }
tracing-appender = { version = "0.2" }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
zbus = { version = "6", default-features = false, features = [
"tokio",
"proxy",
+10 -10
View File
@@ -1,27 +1,27 @@
[package]
name = "komorebic-linux"
version.workspace = true
version = "0.1.0"
description = "The command-line interface for Komorebi, a tiling window manager for KDE Plasma"
edition = "2024"
[dependencies]
komorebi-config = { workspace = true }
komorebi-config = { path = "../../crates/komorebi-config", default-features = false, features = ["schemars"] }
komorebi = { package = "komorebi-linux", path = "../komorebi", default-features = false }
komorebi-client = { package = "komorebi-client-linux", path = "../komorebi-client", default-features = false }
komorebi-hotkeys = { path = "../komorebi-hotkeys" }
komorebic-core = { path = "../../crates/komorebic-core" }
version = { package = "version-linux", path = "../version" }
clap = { workspace = true }
clap = { version = "4", features = ["derive", "wrap_help"] }
clap_complete = "4"
chrono = { workspace = true }
color-eyre = { workspace = true }
dirs = { workspace = true }
chrono = { version = "0.4" }
color-eyre = { version = "0.6" }
dirs = { version = "7" }
fs-tail = "0.1"
lazy_static = { workspace = true }
schemars = { workspace = true, optional = true }
serde_json = { workspace = true }
sysinfo = { workspace = true }
lazy_static = { version = "1" }
schemars = { version = "1.1", optional = true }
serde_json = { package = "serde_json_lenient", version = "0.2" }
sysinfo = { version = "0.40" }
[features]
default = ["schemars"]
+3 -3
View File
@@ -1,13 +1,13 @@
[package]
name = "version-linux"
edition = "2024"
version.workspace = true
version = "0.1.0"
[dependencies]
shadow-rs = { workspace = true }
shadow-rs = { version = "2" }
[build-dependencies]
shadow-rs = { workspace = true }
shadow-rs = { version = "2" }
[lib]
name = "version"
-8142
View File
File diff suppressed because it is too large. Load diff
-54
View File
@@ -1,54 +0,0 @@
[workspace]
resolver = "2"
members = [
"komorebi",
"komorebi-bar",
"komorebi-client",
"komorebic",
"version",
]
[workspace.package]
version = "0.1.0"
[workspace.dependencies]
komorebi-themes = { path = "../komorebi-themes" }
komorebi-backend = { path = "../crates/komorebi-backend" }
komorebi-collections = { path = "../crates/komorebi-collections" }
komorebi-config = { path = "../crates/komorebi-config", default-features = false, features = ["schemars"] }
komorebi-settings = { path = "../crates/komorebi-settings" }
komorebi-protocol = { path = "../crates/komorebi-protocol", default-features = false, features = ["schemars"] }
komorebi-transport = { path = "../crates/komorebi-transport" }
komorebi-layouts = { path = "../komorebi-layouts", features = [
"darwin",
"schemars",
] }
chrono = "0.4"
chrono-tz = "0.10"
clap = { version = "4", features = ["derive", "wrap_help"] }
color-eyre = "0.6"
crossbeam-channel = "0.5"
crossbeam-utils = "0.8"
dirs = "6"
dunce = "1"
eframe = "0.33"
egui_extras = "0.33"
hotwatch = "0.5"
lazy_static = "1"
parking_lot = "0.12"
pastey = "0.2"
schemars = "1.1"
serde = { version = "1", features = ["derive"] }
serde_json = { package = "serde_json_lenient", version = "0.2" }
shadow-rs = "1"
sysinfo = "0.38"
thiserror = "2"
tracing = "0.1"
tracing-appender = "0.2"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
which = "8"
[workspace.metadata.crane]
name = "komorebi-workspace"
+18 -18
View File
@@ -8,22 +8,22 @@ edition = "2024"
[dependencies]
komorebi-bar-core = { path = "../../crates/komorebi-bar-core", default-features = false }
komorebi-client = { package = "komorebi-client-macos", path = "../komorebi-client", default-features = false }
komorebi-themes = { workspace = true }
komorebi-themes = { path = "../../komorebi-themes" }
chrono = { workspace = true }
chrono-tz = { workspace = true }
clap = { workspace = true }
color-eyre = { workspace = true }
crossbeam-channel = { workspace = true }
dirs = { workspace = true }
dunce = { workspace = true }
eframe = { workspace = true }
chrono = { version = "0.4" }
chrono-tz = { version = "0.10" }
clap = { version = "4", features = ["derive", "wrap_help"] }
color-eyre = { version = "0.6" }
crossbeam-channel = { version = "0.5" }
dirs = { version = "6" }
dunce = { version = "1" }
eframe = { version = "0.33" }
egui-phosphor = { git = "https://github.com/amPerl/egui-phosphor", rev = "d13688738478ecd12b426e3e74c59d6577a85b59" }
font-loader = "0.11"
hotwatch = { workspace = true }
hotwatch = { version = "0.5" }
icns = "0.4"
image = "0.25"
lazy_static = { workspace = true }
lazy_static = { version = "1" }
netdev = "0.40"
num = "0.4"
num-derive = "0.4"
@@ -37,15 +37,15 @@ objc2-app-kit = { version = "0.3", default-features = false, features = [
"NSWindow",
] }
raw-window-handle = "0.6"
parking_lot = { workspace = true }
parking_lot = { version = "0.12" }
random_word = { version = "0.5", features = ["en"] }
reqwest = { version = "0.12", features = ["blocking"] }
schemars = { workspace = true, optional = true }
serde = { workspace = true }
serde_json = { workspace = true }
sysinfo = { workspace = true }
tracing = { workspace = true }
tracing-subscriber = { workspace = true }
schemars = { version = "1.1", optional = true }
serde = { version = "1", features = ["derive"] }
serde_json = { package = "serde_json_lenient", version = "0.2" }
sysinfo = { version = "0.38" }
tracing = { version = "0.1" }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
[features]
default = ["schemars"]
+2 -2
View File
@@ -5,9 +5,9 @@ edition = "2024"
[dependencies]
komorebi = { package = "komorebi-macos", path = "../komorebi", default-features = false }
komorebi-themes = { workspace = true }
komorebi-themes = { path = "../../komorebi-themes" }
serde_json = { workspace = true }
serde_json = { package = "serde_json_lenient", version = "0.2" }
[features]
default = ["schemars"]
+27 -27
View File
@@ -5,30 +5,30 @@ description = "A tiling window manager for macOS"
edition = "2024"
[dependencies]
komorebi-themes = { workspace = true }
komorebi-backend = { workspace = true }
komorebi-collections = { workspace = true }
komorebi-layouts = { workspace = true }
komorebi-config = { workspace = true }
komorebi-settings = { workspace = true }
komorebi-protocol = { workspace = true }
komorebi-transport = { workspace = true }
komorebi-themes = { path = "../../komorebi-themes" }
komorebi-backend = { path = "../../crates/komorebi-backend" }
komorebi-collections = { path = "../../crates/komorebi-collections" }
komorebi-layouts = { path = "../../komorebi-layouts", features = ["darwin", "schemars"] }
komorebi-config = { path = "../../crates/komorebi-config", default-features = false, features = ["schemars"] }
komorebi-settings = { path = "../../crates/komorebi-settings" }
komorebi-protocol = { path = "../../crates/komorebi-protocol", default-features = false, features = ["schemars"] }
komorebi-transport = { path = "../../crates/komorebi-transport" }
quickxml_to_serde = { git = "https://github.com/LGUG2Z/quickxml_to_serde.git", version = "0.6.1" }
version = { package = "version-macos", path = "../version" }
base64 = "0.22"
block2 = "0.6"
clap = { workspace = true }
chrono = { workspace = true }
color-eyre = { workspace = true }
crossbeam-channel = { workspace = true }
crossbeam-utils = { workspace = true }
clap = { version = "4", features = ["derive", "wrap_help"] }
chrono = { version = "0.4" }
color-eyre = { version = "0.6" }
crossbeam-channel = { version = "0.5" }
crossbeam-utils = { version = "0.8" }
ctrlc = { version = "3", features = ["termination"] }
dirs = { workspace = true }
dirs = { version = "6" }
dispatch2 = "0.3"
ed25519-dalek = "2"
hotwatch = { workspace = true }
lazy_static = { workspace = true }
hotwatch = { version = "0.5" }
lazy_static = { version = "1" }
nanoid = "0.4"
objc2 = { version = "0.6", default-features = false, features = ["std"] }
objc2-app-kit = { version = "0.3", default-features = false, features = [
@@ -110,22 +110,22 @@ objc2-quartz-core = { version = "0.3", default-features = false, features = [
"CALayer",
"CATransaction",
] }
parking_lot = { workspace = true }
pastey = { workspace = true }
parking_lot = { version = "0.12" }
pastey = { version = "0.2" }
regex = "1"
# pinning to 0.12 until this is resolved: https://github.com/seanmonstar/reqwest/issues/2924
reqwest = { version = "0.12", features = ["blocking"] }
schemars = { workspace = true, optional = true }
serde = { workspace = true }
serde_json = { workspace = true, features = ["preserve_order"] }
schemars = { version = "1.1", optional = true }
serde = { version = "1", features = ["derive"] }
serde_json = { package = "serde_json_lenient", version = "0.2", features = ["preserve_order"] }
serde_with = { version = "3", features = ["schemars_1"] }
shadow-rs = { workspace = true }
shadow-rs = { version = "1" }
strum = { version = "0.28", features = ["derive"] }
sysinfo = { workspace = true }
thiserror = { workspace = true }
tracing = { workspace = true }
tracing-appender = { workspace = true }
tracing-subscriber = { workspace = true }
sysinfo = { version = "0.38" }
thiserror = { version = "2" }
tracing = { version = "0.1" }
tracing-appender = { version = "0.2" }
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
[dev-dependencies]
uuid = { version = "1", features = ["v4"] }
+10 -10
View File
@@ -5,23 +5,23 @@ description = "The command-line interface for Komorebi, a tiling window manager
edition = "2024"
[dependencies]
komorebi-config = { workspace = true }
komorebi-config = { path = "../../crates/komorebi-config", default-features = false, features = ["schemars"] }
komorebi-client = { package = "komorebi-client-macos", path = "../komorebi-client", default-features = false }
komorebic-core = { path = "../../crates/komorebic-core" }
version = { package = "version-macos", path = "../version" }
clap = { workspace = true }
clap = { version = "4", features = ["derive", "wrap_help"] }
clap_complete = "4"
chrono = { workspace = true }
color-eyre = { workspace = true }
dirs = { workspace = true }
chrono = { version = "0.4" }
color-eyre = { version = "0.6" }
dirs = { version = "6" }
fs-tail = "0.1"
lazy_static = { workspace = true }
lazy_static = { version = "1" }
reqwest = { version = "0.12", features = ["blocking"] }
schemars = { workspace = true, optional = true }
serde_json = { workspace = true }
shadow-rs = { workspace = true }
sysinfo = { workspace = true }
schemars = { version = "1.1", optional = true }
serde_json = { package = "serde_json_lenient", version = "0.2" }
shadow-rs = { version = "1" }
sysinfo = { version = "0.38" }
[features]
default = ["schemars"]
+3 -3
View File
@@ -1,13 +1,13 @@
[package]
name = "version-macos"
edition = "2024"
version.workspace = true
version = "0.1.0"
[dependencies]
shadow-rs = { workspace = true }
shadow-rs = { version = "1" }
[build-dependencies]
shadow-rs = { workspace = true }
shadow-rs = { version = "1" }
[lib]
name = "version"