feat: add separator color config and config aliases

barkleesanders · claude · barkleesanders · commit e80d5a91363c · 2026-03-07T19:45:58.000-08:00
- Add separator_color option to [misc] for customizable separator colors (topgrade-rs#682) - Supports named colors (red, green, cyan, etc.) and 256-color indices - New parse_color() utility in terminal.rs - Add [general] as alias for [misc] section name (topgrade-rs#1472) - Document new config options in config.example.toml: - github_token, separator_color, distribution_override, nix_flake_dirs Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
diff --git a/config.example.toml b/config.example.toml
@@ -118,6 +118,15 @@
 #   autodetect, nh, vanilla
 # nix_handler = "autodetect"
 
+# GitHub token for self-update to avoid rate limiting.
+# Can also be set via TOPGRADE_GITHUB_TOKEN or GITHUB_TOKEN environment variables.
+# github_token = "ghp_..."
+
+# Customize the separator line color.
+# Accepted values: black, red, green, yellow, blue, magenta, cyan, white
+# or a 256-color index (e.g., "208" for orange).
+# separator_color = "cyan"
+
 
 # Commands to run before anything
 [pre_commands]
@@ -245,6 +254,14 @@
 # Extra Home Manager arguments
 # home_manager_arguments = ["--flake", "file"]
 
+# Override distribution detection for derivative distros.
+# Useful when your distro is not detected correctly.
+# Accepted values: alpine, arch, centos, debian, fedora, gentoo, nixos, opensuse, void, etc.
+# distribution_override = "arch"
+
+# Nix flake directories to update (requires nix flake support)
+# nix_flake_dirs = ["~/nixos-config", "~/my-flake"]
+
 # KDE Plasmoids (package IDs or exact names) to exclude from updates.
 # excluded_plasmoids = [""]
 
diff --git a/src/config.rs b/src/config.rs
@@ -461,6 +461,8 @@ pub struct Misc {
     nix_handler: Option<NixHandler>,
 
     github_token: Option<String>,
+
+    separator_color: Option<String>,
 }
 
 #[derive(Clone, Copy, Debug, Deserialize, ValueEnum, Default)]
@@ -642,6 +644,7 @@ pub struct ConfigFile {
     include: Option<Include>,
 
     #[merge(strategy = crate::utils::merge_strategies::inner_merge_opt)]
+    #[serde(alias = "general")]
     misc: Option<Misc>,
 
     #[merge(strategy = crate::utils::merge_strategies::commands_merge_opt)]
@@ -2004,6 +2007,14 @@ impl Config {
             .or_else(|| std::env::var("GITHUB_TOKEN").ok())
     }
 
+    /// Get the configured separator color name (e.g., "cyan", "green", "red")
+    pub fn separator_color(&self) -> Option<&str> {
+        self.config_file
+            .misc
+            .as_ref()
+            .and_then(|misc| misc.separator_color.as_deref())
+    }
+
     pub fn enable_mandb(&self) -> bool {
         self.config_file
             .mandb
diff --git a/src/main.rs b/src/main.rs
@@ -130,6 +130,7 @@ fn run() -> Result<()> {
     display_time(config.display_time());
     set_desktop_notifications(config.notify_each_step());
     set_show_step_ids(config.show_step_ids());
+    set_separator_color(config.separator_color().and_then(parse_color));
 
     debug!("Version: {}", crate_version!());
     debug!("OS: {}", env!("TARGET"));
diff --git a/src/terminal.rs b/src/terminal.rs
@@ -8,7 +8,7 @@ use std::time::Duration;
 use chrono::{Local, Timelike};
 use color_eyre::eyre;
 use color_eyre::eyre::Context;
-use console::{Key, Term, measure_text_width, style};
+use console::{Color, Key, Term, measure_text_width, style};
 use notify_rust::{Notification, Timeout};
 use rust_i18n::t;
 use tracing::{debug, error};
@@ -44,6 +44,7 @@ struct Terminal {
     desktop_notification: bool,
     show_step_ids: bool,
     current_step_id: Option<String>,
+    separator_color: Option<Color>,
 }
 
 impl Terminal {
@@ -58,13 +59,18 @@ impl Terminal {
             desktop_notification: false,
             show_step_ids: false,
             current_step_id: None,
+            separator_color: None,
         }
     }
 
     fn set_show_step_ids(&mut self, show: bool) {
         self.show_step_ids = show;
     }
 
+    fn set_separator_color(&mut self, color: Option<Color>) {
+        self.separator_color = color;
+    }
+
     fn set_current_step_id(&mut self, step_id: Option<String>) {
         self.current_step_id = step_id;
     }
@@ -132,24 +138,25 @@ impl Terminal {
 
         match self.width {
             Some(width) => {
-                self.term
-                    .write_fmt(format_args!(
-                        "{}\n",
-                        style(format_args!(
-                            "\n── {} {:─^border$}",
-                            message,
-                            "",
-                            border = max(
-                                2,
-                                min(80, width as usize)
-                                    .checked_sub(4)
-                                    .and_then(|e| e.checked_sub(measure_text_width(&message)))
-                                    .unwrap_or(0)
-                            )
-                        ))
-                        .bold()
-                    ))
-                    .ok();
+                let styled = style(format!(
+                    "\n── {} {:─^border$}",
+                    message,
+                    "",
+                    border = max(
+                        2,
+                        min(80, width as usize)
+                            .checked_sub(4)
+                            .and_then(|e| e.checked_sub(measure_text_width(&message)))
+                            .unwrap_or(0)
+                    )
+                ))
+                .bold();
+                let styled = if let Some(color) = self.separator_color {
+                    styled.fg(color)
+                } else {
+                    styled
+                };
+                self.term.write_fmt(format_args!("{styled}\n")).ok();
             }
             None => {
                 self.term.write_fmt(format_args!("―― {message} ――\n")).ok();
@@ -368,6 +375,28 @@ pub fn set_current_step_id(step_id: Option<String>) {
     TERMINAL.lock().unwrap().set_current_step_id(step_id);
 }
 
+/// Parse a color name string into a console::Color.
+pub fn parse_color(name: &str) -> Option<Color> {
+    match name.to_lowercase().as_str() {
+        "black" => Some(Color::Black),
+        "red" => Some(Color::Red),
+        "green" => Some(Color::Green),
+        "yellow" => Some(Color::Yellow),
+        "blue" => Some(Color::Blue),
+        "magenta" | "purple" => Some(Color::Magenta),
+        "cyan" => Some(Color::Cyan),
+        "white" => Some(Color::White),
+        _ => {
+            // Try parsing as a 256-color index (e.g., "208" for orange)
+            name.parse::<u8>().ok().map(Color::Color256)
+        }
+    }
+}
+
+pub fn set_separator_color(color: Option<Color>) {
+    TERMINAL.lock().unwrap().set_separator_color(color);
+}
+
 /// Print a summary of all updated components collected during the run.
 pub fn print_updated_components_summary(report: &[(impl AsRef<str>, StepResult)]) {
     let mut any_updates = false;
