diff --git a/komorebi-bar/src/bar.rs b/komorebi-bar/src/bar.rs index 7442e3f4..c0143e59 100644 --- a/komorebi-bar/src/bar.rs +++ b/komorebi-bar/src/bar.rs @@ -1,4 +1,4 @@ -use crate::config::Group; +use crate::config::Grouping; use crate::config::KomobarConfig; use crate::config::KomobarTheme; use crate::config::Position; @@ -319,9 +319,9 @@ impl Komobar { let mut komobar = Self { config: config.clone(), render_config: RenderConfig { - _group: match config.group { - None => Group::None, - Some(group) => group, + _grouping: match config.grouping { + None => Grouping::None, + Some(grouping) => grouping, }, }, komorebi_notification_state: None, diff --git a/komorebi-bar/src/config.rs b/komorebi-bar/src/config.rs index be1f1995..b1be2eb5 100644 --- a/komorebi-bar/src/config.rs +++ b/komorebi-bar/src/config.rs @@ -29,7 +29,7 @@ pub struct KomobarConfig { /// Theme pub theme: Option, /// Visual grouping for widgets - pub group: Option, + pub grouping: Option, /// Left side widgets (ordered left-to-right) pub left_widgets: Vec, /// Right side widgets (ordered left-to-right) @@ -182,6 +182,6 @@ pub enum LabelPrefix { } #[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)] -pub enum Group { +pub enum Grouping { None } \ No newline at end of file diff --git a/komorebi-bar/src/widget.rs b/komorebi-bar/src/widget.rs index 924926d4..8fb1a4fd 100644 --- a/komorebi-bar/src/widget.rs +++ b/komorebi-bar/src/widget.rs @@ -1,6 +1,6 @@ use crate::battery::Battery; use crate::battery::BatteryConfig; -use crate::config::Group; +use crate::config::Grouping; use crate::cpu::Cpu; use crate::cpu::CpuConfig; use crate::date::Date; @@ -30,7 +30,7 @@ pub trait BarWidget { #[derive(Copy, Clone)] pub struct RenderConfig { /// Sets how widgets are grouped - pub _group: Group, + pub _grouping: Grouping, } #[derive(Clone, Debug, Serialize, Deserialize, JsonSchema)]