Merge pull request #140 from pop-os/cosmic-comp-config

Use cosmic-config for input config; changeable at runtime
pop-os · Sep 1, 2023 · 511ee8d · 511ee8d
2 parents 74706b4 + 1ea0ffd
commit 511ee8d
Show file tree

Hide file tree

Showing 12 changed files with 892 additions and 809 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,6 +5,11 @@ edition = "2021"
 license = "GPL-3.0-only"
 authors = ["Victoria Brekenfeld"]
 
+[workspace]
+members = [
+    "cosmic-comp-config"
+]
+
 [dependencies]
 apply = "0.3.0"
 anyhow = { version = "1.0.51", features = ["backtrace"] }
@@ -30,9 +35,11 @@ ron = "0.7"
 libsystemd = { version = "0.5", optional = true }
 wayland-backend = "0.1.0"
 wayland-scanner = "0.30.0"
+cosmic-comp-config = { path = "cosmic-comp-config" }
+cosmic-config = { git = "https://github.com/pop-os/libcosmic/", rev = "4895b0c", features = ["calloop"] }
 cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", branch = "main", default-features = false, features = ["server"] }
-libcosmic = { git = "https://github.com/pop-os/libcosmic/", rev = "42d7baf", default-features = false }
-iced_tiny_skia = { git = "https://github.com/pop-os/libcosmic/", rev = "42d7baf" }
+libcosmic = { git = "https://github.com/pop-os/libcosmic/", rev = "4895b0c", default-features = false }
+iced_tiny_skia = { git = "https://github.com/pop-os/libcosmic/", rev = "4895b0c" }
 tiny-skia = "0.9"
 ordered-float = "3.0"
 glow = "0.11.2"

diff --git a/cosmic-comp-config/Cargo.toml b/cosmic-comp-config/Cargo.toml
@@ -0,0 +1,8 @@
+[package]
+name = "cosmic-comp-config"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+input = "0.8.3"
+serde = { version = "1", features = ["derive"] }