cosmic: Provide CosmicConfigEntry impl, use _ in property names
It seems to derive `CosmicConfigEntry`, we need to use `_` in property names, because `_` isn't mapped to `-` and there doesn't seem to be a mechanism like `#[serde(rename)]`. It seems good to be consistent anyway. So this seems good to change, unless we really like using `-` for names on disk, then cosmic-panel needs to be changed. `CosmicConfigEntry` also requires `PartialEq`, which is easy enough to add. This will break existing input settings, which will have to be re-applied with the new locations. Cosmic-settings also need to be updated for this.
This commit is contained in:
parent
d4d51192b5
commit
aa9ec52e62
6 changed files with 30 additions and 17 deletions
|
|
@ -1,11 +1,22 @@
|
|||
// SPDX-License-Identifier: GPL-3.0-only
|
||||
|
||||
use cosmic_config::{cosmic_config_derive::CosmicConfigEntry, CosmicConfigEntry};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::collections::HashMap;
|
||||
|
||||
pub mod input;
|
||||
pub mod workspace;
|
||||
|
||||
#[derive(Debug, Clone, Deserialize, Serialize)]
|
||||
#[derive(Clone, Debug, Default, PartialEq, CosmicConfigEntry)]
|
||||
pub struct CosmicCompConfig {
|
||||
pub workspaces: workspace::WorkspaceConfig,
|
||||
pub input_default: input::InputConfig,
|
||||
pub input_touchpad: input::InputConfig,
|
||||
pub input_devices: HashMap<String, input::InputConfig>,
|
||||
pub xkb_config: XkbConfig,
|
||||
}
|
||||
|
||||
#[derive(Debug, Clone, PartialEq, Deserialize, Serialize)]
|
||||
pub struct XkbConfig {
|
||||
pub rules: String,
|
||||
pub model: String,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue