Skip to content

Commit 511ee8d

Browse files
authored
Merge pull request #140 from pop-os/cosmic-comp-config
Use cosmic-config for input config; changeable at runtime
2 parents 74706b4 + 1ea0ffd commit 511ee8d

File tree

12 files changed

+892
-809
lines changed

12 files changed

+892
-809
lines changed

Cargo.lock

Lines changed: 27 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ edition = "2021"
55
license = "GPL-3.0-only"
66
authors = ["Victoria Brekenfeld"]
77

8+
[workspace]
9+
members = [
10+
"cosmic-comp-config"
11+
]
12+
813
[dependencies]
914
apply = "0.3.0"
1015
anyhow = { version = "1.0.51", features = ["backtrace"] }
@@ -30,9 +35,11 @@ ron = "0.7"
3035
libsystemd = { version = "0.5", optional = true }
3136
wayland-backend = "0.1.0"
3237
wayland-scanner = "0.30.0"
38+
cosmic-comp-config = { path = "cosmic-comp-config" }
39+
cosmic-config = { git = "https://github.com/pop-os/libcosmic/", rev = "4895b0c", features = ["calloop"] }
3340
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", branch = "main", default-features = false, features = ["server"] }
34-
libcosmic = { git = "https://github.com/pop-os/libcosmic/", rev = "42d7baf", default-features = false }
35-
iced_tiny_skia = { git = "https://github.com/pop-os/libcosmic/", rev = "42d7baf" }
41+
libcosmic = { git = "https://github.com/pop-os/libcosmic/", rev = "4895b0c", default-features = false }
42+
iced_tiny_skia = { git = "https://github.com/pop-os/libcosmic/", rev = "4895b0c" }
3643
tiny-skia = "0.9"
3744
ordered-float = "3.0"
3845
glow = "0.11.2"

cosmic-comp-config/Cargo.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
[package]
2+
name = "cosmic-comp-config"
3+
version = "0.1.0"
4+
edition = "2021"
5+
6+
[dependencies]
7+
input = "0.8.3"
8+
serde = { version = "1", features = ["derive"] }

0 commit comments

Comments
 (0)