Implement color config

Cargo.toml

@@ -19,7 +19,8 @@ clap = { version = "4.5.30", features = ["derive"] }
 console = "0.15.10"
 fuzzy-matcher = "0.3.7"
 laurier = "0.1.0"
-ratatui = "0.29.0"
+ratatui = { version = "0.29.0", features = ["serde"] }
 serde = { version = "1.0.218", features = ["derive"] }
 toml = "0.8.20"
 tui-input = "0.11.1"
+umbra = "0.3.0"

src/config.rs

@@ -2,21 +2,26 @@ use std::{env, path::PathBuf};
 
 use ratatui::style::Color;
 use serde::Deserialize;
+use umbra::optional;
 
 use crate::MatchType;
 
 const CONFIG_PATH_ENV_VAR: &str = "CARGO_SELECTOR_CONFIG";
 
-#[derive(Debug, Default, PartialEq, Eq, Deserialize)]
+#[optional(derives = [Deserialize])]
+#[derive(Debug, Default, PartialEq, Eq)]
 pub struct Config {
     pub match_type: Option<MatchType>,
+    #[nested]
+    pub color: ColorTheme,
 }
 
 impl Config {
     pub fn load() -> Config {
         if let Some(path) = config_file_path() {
             let content = std::fs::read_to_string(path).unwrap();
-            toml::from_str(&content).unwrap()
+            let config: OptionalConfig = toml::from_str(&content).unwrap();
+            config.into()
         } else {
             Config::default()
         }
@@ -27,6 +32,8 @@ fn config_file_path() -> Option<PathBuf> {
     env::var(CONFIG_PATH_ENV_VAR).map(PathBuf::from).ok()
 }
 
+#[optional(derives = [Deserialize])]
+#[derive(Debug, PartialEq, Eq)]
 pub struct ColorTheme {
     pub bg: Color,
 

src/main.rs

@@ -22,7 +22,7 @@ use ratatui::{
 use serde::Deserialize;
 
 use crate::{
-    config::{ColorTheme, Config},
+    config::Config,
     matcher::Matcher,
     tui::{Ret, Tui},
 };
@@ -159,8 +159,7 @@ fn main() -> std::io::Result<ExitCode> {
 
     let config = Config::load();
     let match_type = match_type.or(config.match_type).unwrap_or_default();
-
-    let theme = ColorTheme::default();
+    let theme = config.color;
 
     let mut targets = cargo::get_all_targets();
     if let Some(kind) = kind {