Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ lazygitrs ships with 30+ built-in color themes (Catppuccin, Dracula, Tokyo Night

**Unlike original lazygit, you can switch themes without touching any config file** — just press `?` > **Color Themes** > Enter. Your choice is saved automatically.

**Custom themes:** Drop a `.json` file into `~/.config/lazygitrs/themes/` and it appears in the picker. Start by copying an existing theme from `src/generated_themes/` and tweaking the colors. The format is a flat JSON with all fields optional (unset values are derived from semantic base colors like `primary`, `success`, `error`):
**Custom themes:** Drop a `.json` file into `~/.config/lazygitrs/themes/` and it appears in the picker. A custom theme with the same `id` as a built-in one replaces it. Start by copying an existing theme from `src/generated_themes/` and tweaking the colors. The format is a flat JSON with all fields optional (unset values are derived from semantic base colors like `primary`, `success`, `error`):

```json
{
Expand Down
58 changes: 39 additions & 19 deletions src/config/theme.rs
Original file line number Diff line number Diff line change
Expand Up @@ -781,6 +781,11 @@ impl ColorTheme {
return Theme::dark();
}

// Try user themes loaded at runtime first so users can override built-in themes
if let Some(theme) = load_user_theme(&self.id) {
return theme;
}

// Try embedded themes (generated + custom built-in)
for dir in &[&GENERATED_THEMES_DIR, &CUSTOM_THEMES_DIR] {
for file in dir.files() {
Expand All @@ -797,11 +802,6 @@ impl ColorTheme {
}
}

// Try user themes loaded at runtime
if let Some(theme) = load_user_theme(&self.id) {
return theme;
}

Theme::dark()
}
}
Expand All @@ -823,7 +823,20 @@ pub fn load_color_themes() -> Vec<ColorTheme> {
});
seen_ids.insert("default".to_string());

// 2. Embedded themes (generated + custom built-in)
// 2. User themes from ~/.config/lazygitrs/themes/ (or lazygit/); these take precedence over embedded themes
if let Some(user_themes) = discover_user_themes() {
for (id, name, appearance) in user_themes {
if seen_ids.insert(id.clone()) {
themes.push(ColorTheme {
name,
id,
appearance,
});
}
}
}

// 3. Embedded themes (generated + custom built-in)
for dir in &[&GENERATED_THEMES_DIR, &CUSTOM_THEMES_DIR] {
for file in dir.files() {
if file.path().extension().and_then(|e| e.to_str()) != Some("json") {
Expand All @@ -843,19 +856,6 @@ pub fn load_color_themes() -> Vec<ColorTheme> {
}
}

// 3. User themes from ~/.config/lazygit/themes/
if let Some(user_themes) = discover_user_themes() {
for (id, name, appearance) in user_themes {
if seen_ids.insert(id.clone()) {
themes.push(ColorTheme {
name,
id,
appearance,
});
}
}
}

// Dark themes first, then light — alphabetical within each group.
// Default stays at index 0.
if themes.len() > 1 {
Expand Down Expand Up @@ -1030,3 +1030,23 @@ fn parse_color(s: &str) -> Option<Color> {
_ => None,
}
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn test_white_theme_loaded_and_light() {
// Parse the embedded file directly: `load_color_themes()` and
// `ColorTheme::to_theme()` also read the user's real themes dir, which would let a
// local `white.json` change this result.
let json: ThemeJson = serde_json::from_str(include_str!("../themes/white.json")).unwrap();
assert_eq!(json.id, "white");
assert_eq!(json.name, "White");
assert_eq!(json.resolved_appearance(), ThemeAppearance::Light);

let theme = json.to_theme();
assert_eq!(theme.text, Color::Rgb(0, 0, 0));
assert_eq!(theme.accent, Color::Rgb(0, 0, 0));
}
}
50 changes: 50 additions & 0 deletions src/themes/white.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"id": "white",
"name": "White",
"appearance": "light",
"primary": "#000000",
"secondary": "#2e2e2e",
"accent": "#000000",
"accent_secondary": "#1a1a1a",
"success": "#2e2e2e",
"error": "#000000",
"warning": "#1a1a1a",
"info": "#3a3a3a",
"text": "#000000",
"text_strong": "#000000",
"text_dimmed": "#6e6e6e",
"background": "#ffffff",
"background_panel": "#ffffff",
"selected_bg": "#e0e0e0",
"separator": "#b2b2b2",
"popup_border": "#000000",
"border": "#000000",
"border_active": "#000000",
"diff_add": "#2e2e2e",
"diff_remove": "#000000",
"diff_context": "#000000",
"diff_add_bg": "#e6ffec",
"diff_remove_bg": "#ffebe9",
"diff_add_word": "#acf2bd",
"diff_remove_word": "#ffc8c8",
"diff_line_number": "#8c8c8c",
"syntax_comment": "#6e6e6e",
"syntax_keyword": "#000000",
"syntax_string": "#3a3a3a",
"syntax_number": "#3a3a3a",
"syntax_function": "#000000",
"syntax_type": "#1a1a1a",
"syntax_operator": "#4a4a4a",
"syntax_punctuation": "#4a4a4a",
"syntax_variable": "#2e2e2e",
"graph_colors": [
"#000000",
"#2e2e2e",
"#1a1a1a",
"#3a3a3a",
"#4a4a4a",
"#5a5a5a",
"#6e6e6e",
"#808080"
]
}
Loading