Skip to content

Commit 25a9aa1

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 f139612 commit 25a9aa1

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
@@ -21,13 +21,13 @@ cosmic-greeter-daemon = { path = "daemon" }
2121
dirs = "6"
2222
freedesktop_entry_parser = "1.3.0"
2323
libcosmic = { workspace = true, features = [
24-
"autosize",
25-
"winit",
26-
"multi-window",
27-
"desktop",
28-
"wayland",
29-
"tokio",
30-
"dbus-config",
24+
"autosize",
25+
"winit",
26+
"multi-window",
27+
"desktop",
28+
"wayland",
29+
"tokio",
30+
"dbus-config",
3131
] }
3232
tracing.workspace = true
3333
tracing-journald = { workspace = true, optional = true }
@@ -42,15 +42,15 @@ xdg = "3.0"
4242
tokio = { workspace = true, features = ["full"] }
4343
wayland-client = "0.31.11"
4444
cosmic-settings-subscriptions = { git = "https://github.com/pop-os/cosmic-settings-subscriptions", default-features = false, features = [
45-
"accessibility",
46-
"cosmic_a11y_manager",
45+
"accessibility",
46+
"cosmic_a11y_manager",
4747
] }
4848
cosmic-settings-daemon-config = { git = "https://github.com/pop-os/cosmic-settings-daemon", default-features = false, features = [
49-
"greeter",
49+
"greeter",
5050
] }
5151
cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit" }
5252
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = [
53-
"client",
53+
"client",
5454
] }
5555

5656
# For network status using networkmanager feature
@@ -67,8 +67,8 @@ zbus = { workspace = true }
6767
clap_lex = "0.7"
6868
# Internationalization
6969
i18n-embed = { version = "0.16", features = [
70-
"fluent-system",
71-
"desktop-requester",
70+
"fluent-system",
71+
"desktop-requester",
7272
] }
7373
i18n-embed-fl = "0.10"
7474
rust-embed = "8"
@@ -78,11 +78,11 @@ cosmic-randr-shell = { workspace = true }
7878
kdl.workspace = true
7979
color-eyre.workspace = true
8080
image = { version = "0.25", default-features = false, features = [
81-
"jpeg",
82-
"png",
83-
"rayon",
84-
"webp",
85-
"hdr",
81+
"jpeg",
82+
"png",
83+
"rayon",
84+
"webp",
85+
"hdr",
8686
] }
8787

8888
[dependencies.greetd_ipc]
@@ -110,7 +110,7 @@ members = ["cosmic-greeter-config", "daemon"]
110110
resolver = "2"
111111

112112
[workspace.package]
113-
rust-version = "1.85.0"
113+
rust-version = "1.90.0"
114114

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

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

0 commit comments

Comments
 (0)