Skip to content

refactor: get the outputs config from cosmic-comp-config #395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
hojjatabdollahi wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

refactor: get the outputs config from cosmic-comp-config #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 41 additions & 35 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 22 additions & 21 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ cosmic-greeter-config.workspace = true
cosmic-greeter-daemon = { path = "daemon" }
dirs = "6"
libcosmic = { workspace = true, features = [
"autosize",
"winit",
"multi-window",
"desktop",
"wayland",
"tokio",
"dbus-config",
"autosize",
"winit",
"multi-window",
"desktop",
"wayland",
"tokio",
"dbus-config",
] }
tracing.workspace = true
tracing-journald = { workspace = true, optional = true }
Expand All @@ -41,15 +41,15 @@ xdg = "3.0"
tokio = { workspace = true, features = ["full"] }
wayland-client = "0.31.11"
cosmic-settings-subscriptions = { git = "https://github.com/pop-os/cosmic-settings-subscriptions", default-features = false, features = [
"accessibility",
"cosmic_a11y_manager",
"accessibility",
"cosmic_a11y_manager",
] }
cosmic-settings-daemon-config = { git = "https://github.com/pop-os/cosmic-settings-daemon", default-features = false, features = [
"greeter",
"greeter",
] }
cctk = { git = "https://github.com/pop-os/cosmic-protocols", package = "cosmic-client-toolkit" }
cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = [
"client",
"client",
] }

# For network status using networkmanager feature
Expand All @@ -66,8 +66,8 @@ zbus = { workspace = true }
clap_lex = "0.7"
# Internationalization
i18n-embed = { version = "0.16", features = [
"fluent-system",
"desktop-requester",
"fluent-system",
"desktop-requester",
] }
i18n-embed-fl = "0.10"
rust-embed = "8"
Expand All @@ -77,11 +77,11 @@ cosmic-randr-shell = { workspace = true }
kdl.workspace = true
color-eyre.workspace = true
image = { version = "0.25", default-features = false, features = [
"jpeg",
"png",
"rayon",
"webp",
"hdr",
"jpeg",
"png",
"rayon",
"webp",
"hdr",
] }

[dependencies.greetd_ipc]
Expand Down Expand Up @@ -109,7 +109,7 @@ members = ["cosmic-greeter-config", "daemon"]
resolver = "2"

[workspace.package]
rust-version = "1.85.0"
rust-version = "1.90.0"

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

[workspace.dependencies.cosmic-comp-config]
git = "https://github.com/pop-os/cosmic-comp"
# git = "https://github.com/pop-os/cosmic-comp"
path = "../cosmic-comp/cosmic-comp-config/"
default-features = false
features = ["output", "randr"]

Expand Down
Loading