diff --git a/komorebi-bar/src/config.rs b/komorebi-bar/src/config.rs index 015995eb..8f8d2ce4 100644 --- a/komorebi-bar/src/config.rs +++ b/komorebi-bar/src/config.rs @@ -13,15 +13,6 @@ use serde::Serialize; use std::collections::HashMap; use std::path::PathBuf; -mod defaults { - pub const HEIGHT: f32 = 50.0; - pub const FONT_SIZE: f32 = 12.5; - pub const ICON_SCALE: f32 = 1.4; - pub const MAX_LABEL_WIDTH: f32 = 400.0; - pub const TRANSPARENCY_ALPHA: u8 = 200; - pub const WIDGET_SPACING: f32 = 10.0; -} - #[derive(Clone, Debug, Serialize, Deserialize)] #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] /// The `komorebi.bar.json` static configuration file reference for komorebi for Mac `v0.1.0` @@ -29,7 +20,7 @@ mod defaults { /// `"$schema": "https://komorebi-for-mac.lgug2z.com/komorebi.bar.0.1.0.schema.json"` pub struct KomobarConfig { /// Bar height - #[cfg_attr(feature = "schemars", schemars(extend("default" = defaults::HEIGHT)))] + #[cfg_attr(feature = "schemars", schemars(extend("default" = 50.0)))] pub height: Option, /// Bar padding. Use one value for all sides or use a grouped padding for horizontal and/or /// vertical definition which can each take a single value for a symmetric padding or two @@ -89,21 +80,21 @@ pub struct KomobarConfig { /// Font family pub font_family: Option, /// Font size - #[cfg_attr(feature = "schemars", schemars(extend("default" = defaults::FONT_SIZE)))] + #[cfg_attr(feature = "schemars", schemars(extend("default" = 12.5)))] pub font_size: Option, /// Scale of the icons relative to the font_size [[1.0-2.0]] - #[cfg_attr(feature = "schemars", schemars(extend("default" = defaults::ICON_SCALE)))] + #[cfg_attr(feature = "schemars", schemars(extend("default" = 1.4)))] pub icon_scale: Option, /// Max label width before text truncation - #[cfg_attr(feature = "schemars", schemars(extend("default" = defaults::MAX_LABEL_WIDTH)))] + #[cfg_attr(feature = "schemars", schemars(extend("default" = 400.0)))] pub max_label_width: Option, /// Theme pub theme: Option, /// Alpha value for the color transparency [[0-255]] - #[cfg_attr(feature = "schemars", schemars(extend("default" = defaults::TRANSPARENCY_ALPHA)))] + #[cfg_attr(feature = "schemars", schemars(extend("default" = 200)))] pub transparency_alpha: Option, /// Spacing between widgets - #[cfg_attr(feature = "schemars", schemars(extend("default" = defaults::WIDGET_SPACING)))] + #[cfg_attr(feature = "schemars", schemars(extend("default" = 10.0)))] pub widget_spacing: Option, /// Visual grouping for widgets pub grouping: Option, diff --git a/komorebi-bar/src/render.rs b/komorebi-bar/src/render.rs index 40b74d01..36c67eb9 100644 --- a/komorebi-bar/src/render.rs +++ b/komorebi-bar/src/render.rs @@ -24,10 +24,6 @@ use std::sync::atomic::Ordering; static SHOW_KOMOREBI_LAYOUT_OPTIONS: AtomicUsize = AtomicUsize::new(0); -mod defaults { - pub const TRANSPARENCY_ALPHA: u8 = 200; -} - #[derive(Copy, Clone, Debug, Serialize, Deserialize)] #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] #[serde(tag = "kind")] @@ -370,7 +366,7 @@ pub struct GroupingConfig { /// Styles for the grouping pub style: Option, /// Alpha value for the color transparency [[0-255]] - #[cfg_attr(feature = "schemars", schemars(extend("default" = defaults::TRANSPARENCY_ALPHA)))] + #[cfg_attr(feature = "schemars", schemars(extend("default" = 200)))] pub transparency_alpha: Option, /// Rounding values for the 4 corners. Can be a single or 4 values. pub rounding: Option, diff --git a/komorebi-bar/src/widgets/battery.rs b/komorebi-bar/src/widgets/battery.rs index d36fcc5d..dcd8bd15 100644 --- a/komorebi-bar/src/widgets/battery.rs +++ b/komorebi-bar/src/widgets/battery.rs @@ -17,10 +17,6 @@ use std::process::Command; use std::time::Duration; use std::time::Instant; -mod defaults { - pub const DATA_REFRESH_INTERVAL: u64 = 10; -} - #[derive(Copy, Clone, Debug, Serialize, Deserialize)] #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] /// Battery widget configuration @@ -30,7 +26,7 @@ pub struct BatteryConfig { /// Hide the widget if the battery is at full charge pub hide_on_full_charge: Option, /// Data refresh interval in seconds - #[cfg_attr(feature = "schemars", schemars(extend("default" = defaults::DATA_REFRESH_INTERVAL)))] + #[cfg_attr(feature = "schemars", schemars(extend("default" = 10)))] pub data_refresh_interval: Option, /// Display label prefix pub label_prefix: Option, diff --git a/komorebi-bar/src/widgets/cpu.rs b/komorebi-bar/src/widgets/cpu.rs index e561afb3..bcf3e796 100644 --- a/komorebi-bar/src/widgets/cpu.rs +++ b/komorebi-bar/src/widgets/cpu.rs @@ -16,10 +16,6 @@ use std::time::Instant; use sysinfo::RefreshKind; use sysinfo::System; -mod defaults { - pub const DATA_REFRESH_INTERVAL: u64 = 10; -} - #[derive(Copy, Clone, Debug, Serialize, Deserialize)] #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] /// CPU widget configuration @@ -27,7 +23,7 @@ pub struct CpuConfig { /// Enable the Cpu widget pub enable: bool, /// Data refresh interval in seconds - #[cfg_attr(feature = "schemars", schemars(extend("default" = defaults::DATA_REFRESH_INTERVAL)))] + #[cfg_attr(feature = "schemars", schemars(extend("default" = 10)))] pub data_refresh_interval: Option, /// Display label prefix pub label_prefix: Option, diff --git a/komorebi-bar/src/widgets/memory.rs b/komorebi-bar/src/widgets/memory.rs index ca3db4fe..9e99cdcf 100644 --- a/komorebi-bar/src/widgets/memory.rs +++ b/komorebi-bar/src/widgets/memory.rs @@ -16,10 +16,6 @@ use std::time::Instant; use sysinfo::RefreshKind; use sysinfo::System; -mod defaults { - pub const DATA_REFRESH_INTERVAL: u64 = 10; -} - #[derive(Copy, Clone, Debug, Serialize, Deserialize)] #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] /// Memory widget configuration @@ -27,7 +23,7 @@ pub struct MemoryConfig { /// Enable the Memory widget pub enable: bool, /// Data refresh interval in seconds - #[cfg_attr(feature = "schemars", schemars(extend("default" = defaults::DATA_REFRESH_INTERVAL)))] + #[cfg_attr(feature = "schemars", schemars(extend("default" = 10)))] pub data_refresh_interval: Option, /// Display label prefix pub label_prefix: Option, diff --git a/komorebi-bar/src/widgets/network.rs b/komorebi-bar/src/widgets/network.rs index 878f4d05..806c7968 100644 --- a/komorebi-bar/src/widgets/network.rs +++ b/komorebi-bar/src/widgets/network.rs @@ -24,10 +24,6 @@ use std::time::Duration; use std::time::Instant; use sysinfo::Networks; -mod defaults { - pub const DATA_REFRESH_INTERVAL: u64 = 10; -} - #[derive(Copy, Clone, Debug, Serialize, Deserialize)] #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] /// Network widget configuration @@ -46,7 +42,7 @@ pub struct NetworkConfig { #[serde(alias = "network_activity_fill_characters")] pub activity_left_padding: Option, /// Data refresh interval in seconds - #[cfg_attr(feature = "schemars", schemars(extend("default" = defaults::DATA_REFRESH_INTERVAL)))] + #[cfg_attr(feature = "schemars", schemars(extend("default" = 10)))] pub data_refresh_interval: Option, /// Display label prefix pub label_prefix: Option, diff --git a/komorebi-bar/src/widgets/storage.rs b/komorebi-bar/src/widgets/storage.rs index 7801a185..8c13d0b3 100644 --- a/komorebi-bar/src/widgets/storage.rs +++ b/komorebi-bar/src/widgets/storage.rs @@ -16,12 +16,6 @@ use std::time::Duration; use std::time::Instant; use sysinfo::Disks; -mod defaults { - pub const DATA_REFRESH_INTERVAL: u64 = 10; - pub const SHOW_READ_ONLY_DISKS: bool = false; - pub const SHOW_REMOVABLE_DISKS: bool = true; -} - #[derive(Copy, Clone, Debug, Serialize, Deserialize)] #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] /// Storage widget configuration @@ -29,15 +23,15 @@ pub struct StorageConfig { /// Enable the Storage widget pub enable: bool, /// Data refresh interval in seconds - #[cfg_attr(feature = "schemars", schemars(extend("default" = defaults::DATA_REFRESH_INTERVAL)))] + #[cfg_attr(feature = "schemars", schemars(extend("default" = 10)))] pub data_refresh_interval: Option, /// Display label prefix pub label_prefix: Option, /// Show disks that are read only - #[cfg_attr(feature = "schemars", schemars(extend("default" = defaults::SHOW_READ_ONLY_DISKS)))] + #[cfg_attr(feature = "schemars", schemars(extend("default" = false)))] pub show_read_only_disks: Option, /// Show removable disks - #[cfg_attr(feature = "schemars", schemars(extend("default" = defaults::SHOW_REMOVABLE_DISKS)))] + #[cfg_attr(feature = "schemars", schemars(extend("default" = true)))] pub show_removable_disks: Option, /// Select when the current percentage is over this value [[1-100]] pub auto_select_over: Option, diff --git a/komorebi-bar/src/widgets/time.rs b/komorebi-bar/src/widgets/time.rs index 91b40890..384741a9 100644 --- a/komorebi-bar/src/widgets/time.rs +++ b/komorebi-bar/src/widgets/time.rs @@ -23,10 +23,6 @@ use serde::Serialize; use std::time::Duration; use std::time::Instant; -mod defaults { - pub const CHANGING_ICON: bool = false; -} - lazy_static! { static ref TIME_RANGES: Vec<(&'static str, NaiveTime)> = { vec![ @@ -98,7 +94,7 @@ pub struct TimeConfig { /// ``` pub timezone: Option, /// Change the icon depending on the time. The default icon is used between 8:30 and 12:00 - #[cfg_attr(feature = "schemars", schemars(extend("default" = defaults::CHANGING_ICON)))] + #[cfg_attr(feature = "schemars", schemars(extend("default" = false)))] pub changing_icon: Option, } diff --git a/komorebi-bar/src/widgets/update.rs b/komorebi-bar/src/widgets/update.rs index ac366f74..7c314f1b 100644 --- a/komorebi-bar/src/widgets/update.rs +++ b/komorebi-bar/src/widgets/update.rs @@ -14,10 +14,6 @@ use std::process::Command; use std::time::Duration; use std::time::Instant; -mod defaults { - pub const DATA_REFRESH_INTERVAL: u64 = 12; -} - #[derive(Copy, Clone, Debug, Serialize, Deserialize)] #[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))] /// Update widget configuration @@ -25,7 +21,7 @@ pub struct UpdateConfig { /// Enable the Update widget pub enable: bool, /// Data refresh interval in hours - #[cfg_attr(feature = "schemars", schemars(extend("default" = defaults::DATA_REFRESH_INTERVAL)))] + #[cfg_attr(feature = "schemars", schemars(extend("default" = 12)))] pub data_refresh_interval: Option, /// Display label prefix pub label_prefix: Option, diff --git a/schema.bar.json b/schema.bar.json index 16be74c5..5ca0a0e4 100644 --- a/schema.bar.json +++ b/schema.bar.json @@ -68,7 +68,7 @@ "null" ], "format": "float", - "default": 1.399999976158142 + "default": 1.4 }, "left_widgets": { "description": "Options for mouse interaction on the bar\nLeft side widgets (ordered left-to-right)",