Revert "Configurable bar colours"

This reverts commit e1136ccb589df4d60452d6f24f56f379dabfc738.

Cargo.lock

@@ -83,7 +83,6 @@ dependencies = [
  "clap",
  "clap_complete",
  "colored",
- "colors-transform",
  "crossbeam-channel",
  "crossterm",
  "directories",
@@ -153,7 +152,6 @@ name = "atuin-common"
 version = "14.0.0"
 dependencies = [
  "chrono",
- "colors-transform",
  "serde",
  "uuid",
 ]
@@ -399,12 +397,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "colors-transform"
-version = "0.2.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9226dbc05df4fb986f48d730b001532580883c4c06c5d1c213f4b34c1c157178"
-
 [[package]]
 name = "config"
 version = "0.13.2"

Cargo.toml

@@ -80,7 +80,6 @@ colored = "2.0.0"
 bitflags = "1.3"
 cassowary = "0.3"
 unicode-segmentation = "1.2"
-colors-transform = "0.2.11"
 
 [dependencies.tracing-subscriber]
 version = "0.3"

atuin-client/src/settings.rs

@@ -131,24 +131,6 @@ pub enum WordJumpMode {
     Subl,
 }
 
-#[derive(Clone, Debug, Deserialize)]
-pub struct Bar {
-    pub enabled: bool,
-    pub background_colour: String,
-    pub text_colour: String,
-
-    // parsed at load time from the above
-    #[serde(skip_deserializing)]
-    pub background_colour_parsed: (f32, f32, f32),
-    #[serde(skip_deserializing)]
-    pub text_colour_parsed: (f32, f32, f32),
-}
-
-#[derive(Clone, Debug, Deserialize)]
-pub struct Ui {
-    pub bar: Bar,
-}
-
 #[derive(Clone, Debug, Deserialize)]
 pub struct Settings {
     pub dialect: Dialect,
@@ -172,7 +154,6 @@ pub struct Settings {
     pub scroll_context_lines: usize,
     #[serde(with = "serde_regex", default = "RegexSet::empty")]
     pub history_filter: RegexSet,
-    pub ui: Ui,
 
     // This is automatically loaded when settings is created. Do not set in
     // config! Keep secrets and settings apart.
@@ -362,9 +343,6 @@ impl Settings {
             .set_default("scroll_context_lines", 1)?
             .set_default("shell_up_key_binding", false)?
             .set_default("session_token", "")?
-            .set_default("ui.bar.enabled", true)?
-            .set_default("ui.bar.background_colour", "#ffffff")?
-            .set_default("ui.bar.text_colour", "#000000")?
             .add_source(
                 Environment::with_prefix("atuin")
                     .prefix_separator("_")
@@ -403,16 +381,6 @@ impl Settings {
         let session_path = shellexpand::full(&session_path)?;
         settings.session_path = session_path.to_string();
 
-        // take the colours, parse them, whack the RGB into the settings
-        settings.ui.bar.background_colour_parsed = atuin_common::utils::parse_colour(
-            settings.ui.bar.background_colour.as_str(),
-        )
-        .expect("background_colour expects format rgb(r, g, b), hsl(h, s, l), or hex: #ffffff");
-
-        settings.ui.bar.text_colour_parsed =
-            atuin_common::utils::parse_colour(settings.ui.bar.text_colour.as_str())
-                .expect("text_colour expects format rgb(r, g, b), hsl(h, s, l), or hex: #ffffff");
-
         // Finally, set the auth token
         if Path::new(session_path.to_string().as_str()).exists() {
             let token = fs_err::read_to_string(session_path.to_string())?;

atuin-common/Cargo.toml

@@ -12,6 +12,5 @@ repository = "https://github.com/ellie/atuin"
 
 [dependencies]
 chrono = { version = "0.4", features = ["serde"] }
-colors-transform = "0.2.11"
 serde = { version = "1.0.145", features = ["derive"] }
 uuid = { version = "1.2", features = ["v4"] }

atuin-common/src/utils.rs

@@ -4,8 +4,6 @@ use std::path::PathBuf;
 use chrono::{Months, NaiveDate};
 use uuid::Uuid;
 
-use colors_transform::{Color, Hsl, Rgb};
-
 pub fn uuid_v4() -> String {
     Uuid::new_v4().as_simple().to_string()
 }
@@ -26,32 +24,6 @@ pub fn home_dir() -> PathBuf {
     PathBuf::from(home)
 }
 
-// Take a colour string as rgb, hsl, or hex and return the rgb. Allow fractional colours.
-pub fn parse_colour(colour: &str) -> Option<(f32, f32, f32)> {
-    // Try loading RGB, then from hex, then HSL
-
-    let rgb = colour.parse::<colors_transform::Rgb>();
-
-    if let Ok(rgb) = rgb {
-        return Some((rgb.get_red(), rgb.get_green(), rgb.get_blue()));
-    }
-
-    let rgb = Rgb::from_hex_str(colour);
-
-    if let Ok(rgb) = rgb {
-        return Some((rgb.get_red(), rgb.get_green(), rgb.get_blue()));
-    }
-
-    let hsl = colour.parse::<colors_transform::Hsl>();
-
-    if let Ok(hsl) = hsl {
-        let rgb = hsl.to_rgb();
-        return Some((rgb.get_red(), rgb.get_green(), rgb.get_blue()));
-    }
-
-    return None;
-}
-
 pub fn config_dir() -> PathBuf {
     let config_dir =
         std::env::var("XDG_CONFIG_HOME").map_or_else(|_| home_dir().join(".config"), PathBuf::from);

src/command/client/search/interactive.rs

@@ -100,7 +100,6 @@ impl State {
 
         let ctrl = input.modifiers.contains(KeyModifiers::CONTROL);
         let alt = input.modifiers.contains(KeyModifiers::ALT);
-
         // reset the state, will be set to true later if user really did change it
         self.switched_search_mode = false;
         match input.code {
@@ -238,12 +237,12 @@ impl State {
         f: &mut Frame<'_, T>,
         results: &[HistoryResult],
         compact: bool,
-        settings: &Settings,
+        show_preview: bool,
     ) {
         let border_size = if compact { 0 } else { 1 };
 
         let preview_width = f.size().width - 2;
-        let preview_height = if settings.show_preview {
+        let preview_height = if show_preview {
             let longest_command = results
                 .iter()
                 .max_by(|h1, h2| h1.history.command.len().cmp(&h2.history.command.len()));
@@ -273,7 +272,7 @@ impl State {
                     Constraint::Min(1),
                     Constraint::Length(1 + border_size),
                     Constraint::Length(preview_height),
-                    Constraint::Length(if settings.ui.bar.enabled { 1 } else { 0 }),
+                    Constraint::Length(1),
                 ]
                 .as_ref(),
             )
@@ -306,7 +305,7 @@ impl State {
         let input = self.build_input(compact, chunks[2].width.into());
         f.render_widget(input, chunks[2]);
 
-        let preview = self.build_preview(results, compact, preview_width, chunks[2].width.into());
+        let preview = self.build_preview(results, compact, preview_width, chunks[3].width.into());
         f.render_widget(preview, chunks[3]);
 
         let selected_history = results[self.results_state.selected()].clone();
@@ -391,7 +390,6 @@ impl State {
             .style(Style::default().bg(Color::White).fg(Color::Black));
 
         f.render_widget(directory, bar[0]);
-        f.render_widget(count, bar[1]);
     }
 
     fn build_input(&mut self, compact: bool, chunk_width: usize) -> Paragraph {
@@ -571,7 +569,7 @@ pub async fn history(
             atuin_client::settings::Style::Compact => true,
             atuin_client::settings::Style::Full => false,
         };
-        terminal.draw(|f| app.draw(f, &results, compact, settings))?;
+        terminal.draw(|f| app.draw(f, &results, compact, settings.show_preview))?;
 
         let initial_input = app.search.input.as_str().to_owned();
         let initial_filter_mode = app.search.filter_mode;