Skip to content

Commit 97e95ef

Browse files
refactor: get the outputs config from cosmic-comp-config
Previously greeter had to get the outputs.ron config from cosmic-comp-config and then match it to the available displays. Now, it just sends the displays to the cosmic-comp-config and asks it to return the matching config. Moving the "match" logic to one place.
1 parent 2cbb199 commit 97e95ef

File tree

5 files changed

+93
-118
lines changed

5 files changed

+93
-118
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@ cosmic-greeter-config.workspace = true
2020
cosmic-greeter-daemon = { path = "daemon" }
2121
dirs = "6"
2222
libcosmic = { workspace = true, features = [
23-
"autosize",
24-
"winit",
25-
"multi-window",
26-
"desktop",
27-
"wayland",
28-
"tokio",
29-
"dbus-config",
23+
"autosize",
24+
"winit",
25+
"multi-window",
26+
"desktop",
27+
"wayland",
28+
"tokio",
29+
"dbus-config",
3030
] }
3131
tracing.workspace = true
3232
tracing-journald = { workspace = true, optional = true }
@@ -41,15 +41,15 @@ xdg = "3.0"
4141
tokio = { workspace = true, features = ["full"] }
4242
wayland-client = "0.31.11"
4343
cosmic-settings-subscriptions = { git = "https://github.com/pop-os/cosmic-settings-subscriptions", default-features = false, features = [
44-
"accessibility",
45-
"cosmic_a11y_manager",
44+
"accessibility",
45+
"cosmic_a11y_manager",
4646
] }
4747
cosmic-settings-daemon-config = { git = "https://github.com/pop-os/cosmic-settings-daemon", default-features = false, features = [
48-
"greeter",
48+
"greeter",
4949
] }
5050
cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit" }
5151
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = [
52-
"client",
52+
"client",
5353
] }
5454

5555
# For network status using networkmanager feature
@@ -66,8 +66,8 @@ zbus = { workspace = true }
6666
clap_lex = "0.7"
6767
# Internationalization
6868
i18n-embed = { version = "0.16", features = [
69-
"fluent-system",
70-
"desktop-requester",
69+
"fluent-system",
70+
"desktop-requester",
7171
] }
7272
i18n-embed-fl = "0.10"
7373
rust-embed = "8"
@@ -77,11 +77,11 @@ cosmic-randr-shell = { workspace = true }
7777
kdl.workspace = true
7878
color-eyre.workspace = true
7979
image = { version = "0.25", default-features = false, features = [
80-
"jpeg",
81-
"png",
82-
"rayon",
83-
"webp",
84-
"hdr",
80+
"jpeg",
81+
"png",
82+
"rayon",
83+
"webp",
84+
"hdr",
8585
] }
8686

8787
[dependencies.greetd_ipc]
@@ -109,7 +109,7 @@ members = ["cosmic-greeter-config", "daemon"]
109109
resolver = "2"
110110

111111
[workspace.package]
112-
rust-version = "1.85.0"
112+
rust-version = "1.90.0"
113113

114114
[workspace.dependencies]
115115
tracing = "0.1"
@@ -120,7 +120,7 @@ color-eyre = "0.6.5"
120120
# Fix zbus compilation by manually adding nix with user feature
121121
nix = { version = "0.30", features = ["user"] }
122122
pwd = "1.4.0"
123-
ron = "0.11"
123+
ron = "0.12"
124124
serde = "1"
125125
tokio = "1.47.1"
126126
zbus = "5"
@@ -136,7 +136,8 @@ git = "https://github.com/pop-os/cosmic-bg"
136136
default-features = false
137137

138138
[workspace.dependencies.cosmic-comp-config]
139-
git = "https://github.com/pop-os/cosmic-comp"
139+
# git = "https://github.com/pop-os/cosmic-comp"
140+
path = "../cosmic-comp/cosmic-comp-config/"
140141
default-features = false
141142
features = ["output", "randr"]
142143

0 commit comments

Comments
 (0)