refactor: split bar/top-level config structs

This allows for some options which are not actually bar-level to be separated, which makes some work moving forward a little easier and keeps things cleaner.

src/bar.rs

@@ -1,9 +1,9 @@
-use crate::config::{BarPosition, MarginConfig, ModuleConfig};
+use crate::config::{BarConfig, BarPosition, MarginConfig, ModuleConfig};
 use crate::modules::{
     create_module, set_widget_identifiers, wrap_widget, ModuleInfo, ModuleLocation,
 };
 use crate::popup::Popup;
-use crate::{Config, Ironbar};
+use crate::Ironbar;
 use color_eyre::Result;
 use glib::Propagation;
 use gtk::gdk::Monitor;
@@ -16,7 +16,7 @@ use tracing::{debug, info};
 
 #[derive(Debug, Clone)]
 enum Inner {
-    New { config: Option<Config> },
+    New { config: Option<BarConfig> },
     Loaded { popup: Rc<Popup> },
 }
 
@@ -43,7 +43,7 @@ impl Bar {
     pub fn new(
         app: &Application,
         monitor_name: String,
-        config: Config,
+        config: BarConfig,
         ironbar: Rc<Ironbar>,
     ) -> Self {
         let window = ApplicationWindow::builder()
@@ -245,7 +245,7 @@ impl Bar {
     }
 
     /// Loads the configured modules onto a bar.
-    fn load_modules(&self, config: Config, monitor: &Monitor) -> Result<BarLoadResult> {
+    fn load_modules(&self, config: BarConfig, monitor: &Monitor) -> Result<BarLoadResult> {
         let icon_theme = IconTheme::new();
         if let Some(ref theme) = config.icon_theme {
             icon_theme.set_custom_theme(Some(theme));
@@ -408,7 +408,7 @@ pub fn create_bar(
     app: &Application,
     monitor: &Monitor,
     monitor_name: String,
-    config: Config,
+    config: BarConfig,
     ironbar: Rc<Ironbar>,
 ) -> Result<Bar> {
     let bar = Bar::new(app, monitor_name, config, ironbar);

src/config/impl.rs

@@ -1,4 +1,4 @@
-use super::{BarPosition, Config, MonitorConfig};
+use super::{BarConfig, BarPosition, MonitorConfig};
 use color_eyre::{Help, Report};
 use gtk::Orientation;
 use serde::{Deserialize, Deserializer};
@@ -13,11 +13,11 @@ impl<'de> Deserialize<'de> for MonitorConfig {
         let content =
             <serde::__private::de::Content as serde::Deserialize>::deserialize(deserializer)?;
 
-        match <Config as serde::Deserialize>::deserialize(
+        match <BarConfig as serde::Deserialize>::deserialize(
             serde::__private::de::ContentRefDeserializer::<D::Error>::new(&content),
         ) {
             Ok(config) => Ok(Self::Single(config)),
-            Err(outer) => match <Vec<Config> as serde::Deserialize>::deserialize(
+            Err(outer) => match <Vec<BarConfig> as serde::Deserialize>::deserialize(
                 serde::__private::de::ContentRefDeserializer::<D::Error>::new(&content),
             ) {
                 Ok(config) => Ok(Self::Multiple(config)),

src/config/mod.rs

@@ -64,10 +64,16 @@ pub enum ModuleConfig {
     Workspaces(Box<WorkspacesModule>),
 }
 
+#[derive(Debug, Deserialize, Clone)]
+pub enum BarEntryConfig {
+    Single(BarConfig),
+    Monitors(HashMap<String, MonitorConfig>),
+}
+
 #[derive(Debug, Clone)]
 pub enum MonitorConfig {
-    Single(Config),
-    Multiple(Vec<Config>),
+    Single(BarConfig),
+    Multiple(Vec<BarConfig>),
 }
 
 #[derive(Debug, Deserialize, Copy, Clone, PartialEq, Eq)]
@@ -98,7 +104,7 @@ pub struct MarginConfig {
 }
 
 #[derive(Debug, Deserialize, Clone)]
-pub struct Config {
+pub struct BarConfig {
     #[serde(default)]
     pub position: BarPosition,
     #[serde(default = "default_true")]
@@ -107,8 +113,6 @@ pub struct Config {
     pub height: i32,
     #[serde(default)]
     pub margin: MarginConfig,
-    #[serde(default = "default_popup_gap")]
-    pub popup_gap: i32,
     pub name: Option<String>,
 
     #[serde(default)]
@@ -119,16 +123,15 @@ pub struct Config {
     /// GTK icon theme to use.
     pub icon_theme: Option<String>,
 
-    pub ironvar_defaults: Option<HashMap<Box<str>, String>>,
-
     pub start: Option<Vec<ModuleConfig>>,
     pub center: Option<Vec<ModuleConfig>>,
     pub end: Option<Vec<ModuleConfig>>,
 
-    pub monitors: Option<HashMap<String, MonitorConfig>>,
+    #[serde(default = "default_popup_gap")]
+    pub popup_gap: i32,
 }
 
-impl Default for Config {
+impl Default for BarConfig {
     fn default() -> Self {
         cfg_if! {
             if #[cfg(feature = "clock")] {
@@ -155,20 +158,27 @@ impl Default for Config {
             name: None,
             start_hidden: None,
             autohide: None,
-            popup_gap: default_popup_gap(),
             icon_theme: None,
-            ironvar_defaults: None,
             start: Some(vec![ModuleConfig::Label(
                 LabelModule::new("ℹ️ Using default config".to_string()).into(),
             )]),
             center,
             end,
             anchor_to_edges: default_true(),
-            monitors: None,
+            popup_gap: default_popup_gap(),
         }
     }
 }
 
+#[derive(Debug, Deserialize, Clone, Default)]
+pub struct Config {
+    pub ironvar_defaults: Option<HashMap<Box<str>, String>>,
+
+    #[serde(flatten)]
+    pub bar: BarConfig,
+    pub monitors: Option<HashMap<String, MonitorConfig>>,
+}
+
 const fn default_bar_height() -> i32 {
     42
 }

src/main.rs

@@ -331,7 +331,7 @@ fn load_output_bars(
         .expect("monitor to exist");
 
     let show_default_bar =
-        config.start.is_some() || config.center.is_some() || config.end.is_some();
+        config.bar.start.is_some() || config.bar.center.is_some() || config.bar.end.is_some();
 
     let bars = match config
         .monitors
@@ -363,7 +363,7 @@ fn load_output_bars(
             app,
             &monitor,
             monitor_name.to_string(),
-            config.clone(),
+            config.bar.clone(),
             ironbar.clone(),
         )?],
         None => vec![],