fix(themes): Restore default theme, refactor (#2294)

* fix(theme): let the base colour remain unchanged

* fix(theme): split out default

* fix(theme): make base theme 'default' not an empty string

* wip(theme): return styles, not colors

* wip(theme): tidy up module structure a little

* wip(theme): removed unhandled references to foreground_color

* chore: fix cargo fmt

* feat(theme): allow crossterm-deserializable colors

Author: philtweir

Cargo.lock

@@ -71,7 +71,7 @@ indicatif = "0.17.7"
 tiny-bip39 = "1"
 
 # theme
-crossterm = "0.27.0"
+crossterm = { version = "0.27.0", features = ["serde"] }
 palette = { version = "0.7.5", features = ["serializing"] }
 lazy_static = "1.4.0"
 strum_macros = "0.26.3"

crates/atuin-client/Cargo.toml

@@ -234,7 +234,7 @@ records = true
 
 # [theme]
 ## Color theme to use for rendering in the terminal.
-## There are some built-in themes, including the base theme which has the default colors,
+## There are some built-in themes, including the base theme ("default"),
 ## "autumn" and "marine". You can add your own themes to the "./themes" subdirectory of your
 ## Atuin config (or ATUIN_THEME_DIR, if provided) as TOML files whose keys should be one or
 ## more of AlertInfo, AlertWarn, AlertError, Annotation, Base, Guidance, Important, and

crates/atuin-client/config.toml

@@ -340,7 +340,7 @@ pub struct Preview {
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 pub struct Theme {
-    /// Name of desired theme ("" for base)
+    /// Name of desired theme ("default" for base)
     pub name: String,
 
     /// Whether any available additional theme debug should be shown
@@ -756,7 +756,7 @@ impl Settings {
             .set_default("daemon.socket_path", socket_path.to_str())?
             .set_default("daemon.systemd_socket", false)?
             .set_default("daemon.tcp_port", 8889)?
-            .set_default("theme.name", "")?
+            .set_default("theme.name", "default")?
             .set_default("theme.debug", None::<bool>)?
             .set_default(
                 "prefers_reduced_motion",