Skip to content

Commit

Permalink
[WIP, incomplete] Port config to TOML
Browse files Browse the repository at this point in the history
  • Loading branch information
YaLTeR committed Jan 7, 2024
1 parent 0a54db6 commit a4adf56
Show file tree
Hide file tree
Showing 9 changed files with 481 additions and 463 deletions.
316 changes: 199 additions & 117 deletions Cargo.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ clap = { version = "4.4.13", features = ["derive"] }
directories = "5.0.1"
git-version = "0.3.9"
keyframe = { version = "1.1.1", default-features = false }
knuffel = "3.2.0"
libc = "0.2.151"
logind-zbus = { version = "3.1.2", optional = true }
log = { version = "0.4.20", features = ["max_level_trace", "release_max_level_debug"] }
miette = "5.10.0"
notify-rust = { version = "4.10.0", optional = true }
pipewire = { version = "0.7.2", optional = true }
png = "0.17.10"
portable-atomic = { version = "1.6.0", default-features = false, features = ["float"] }
profiling = "1.0.13"
sd-notify = "0.4.1"
serde = { version = "1.0.195", features = ["derive"] }
serde_with = "3.4.0"
toml = { version = "0.8.8", default-features = false, features = ["parse"] }
tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
tracing = { version = "0.1.40", features = ["max_level_trace", "release_max_level_debug"] }
tracy-client = { version = "0.16.5", default-features = false }
Expand Down
5 changes: 2 additions & 3 deletions src/backend/tty.rs
Original file line number Diff line number Diff line change
Expand Up @@ -595,9 +595,8 @@ impl Tty {
let config = self
.config
.borrow()
.outputs
.iter()
.find(|o| o.name == output_name)
.output
.get(&output_name)
.cloned()
.unwrap_or_default();

Expand Down
5 changes: 2 additions & 3 deletions src/backend/winit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,8 @@ impl Winit {

let output_config = config
.borrow()
.outputs
.iter()
.find(|o| o.name == "winit")
.output
.get("winit")
.cloned()
.unwrap_or_default();

Expand Down
Loading

0 comments on commit a4adf56

Please sign in to comment.