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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ record-and-replay **workspaces**, a themeable vim-style TUI, and a finder-style
whole sequence in order, in your shell.
- **Vim-style modal TUI** - `Esc` for normal mode, `j/k` to move, `d` to delete, `e` to
edit, `?` for help.
- **Themeable** - 7 built-in themes (including the Catppuccin flavors) plus your own, with
quick switching via `tth theme <name>`.
- **Themeable** - 11 built-in themes (Catppuccin flavors, Dracula, Tokyo Night, Rosé Pine,
Solarized, and more) plus your own, with quick switching via `tth theme <name>`.
- **Sessions, stats, export, and tags** for organizing and reusing your history.
- **Private by default** - Thoth's own commands and anything matching your history filter
are never recorded, and everything lives in a local SQLite database.
Expand Down
5 changes: 3 additions & 2 deletions docs/features.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,9 @@ in its recorded directory.

## Themes

Thoth ships 7 built-in themes: `default`, `ember`, `frost`, and the Catppuccin flavors:
`latte`, `frappe`, `macchiato`, and `mocha`.
Thoth ships 12 built-in themes: `default`, `ember`, `frost`, the Catppuccin flavors
(`latte`, `frappe`, `macchiato`, `mocha`), plus `dracula`, `tokyonight`, `rosepine`,
`solarized`, and `kanagawa`.

```sh
tth theme list # show available themes (built-in + your own)
Expand Down
136 changes: 133 additions & 3 deletions src/theme.rs
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,96 @@ fn mocha_theme() -> Theme {
}
}

fn dracula_theme() -> Theme {
Theme {
selection_bg: rgb(0x44, 0x47, 0x5a),
selection_fg: rgb(0xf8, 0xf8, 0xf2),
accent: rgb(0x8b, 0xe9, 0xfd),
dim: rgb(0x62, 0x72, 0xa4),
border: rgb(0x62, 0x72, 0xa4),
ok: rgb(0x50, 0xfa, 0x7b),
fail: rgb(0xff, 0x55, 0x55),
project: rgb(0xbd, 0x93, 0xf9),
command: rgb(0xf8, 0xf8, 0xf2),
header: rgb(0xff, 0x79, 0xc6),
controls: rgb(0xff, 0x79, 0xc6),
directory: rgb(0x62, 0x72, 0xa4),
tags: rgb(0xf8, 0xf8, 0xf2),
}
}

fn tokyonight_theme() -> Theme {
Theme {
selection_bg: rgb(0x28, 0x34, 0x57),
selection_fg: rgb(0xc0, 0xca, 0xf5),
accent: rgb(0x7d, 0xcf, 0xff),
dim: rgb(0x56, 0x5f, 0x89),
border: rgb(0x56, 0x5f, 0x89),
ok: rgb(0x9e, 0xce, 0x6a),
fail: rgb(0xf7, 0x76, 0x8e),
project: rgb(0x7a, 0xa2, 0xf7),
command: rgb(0xc0, 0xca, 0xf5),
header: rgb(0xbb, 0x9a, 0xf7),
controls: rgb(0xbb, 0x9a, 0xf7),
directory: rgb(0x56, 0x5f, 0x89),
tags: rgb(0xc0, 0xca, 0xf5),
}
}

fn rosepine_theme() -> Theme {
Theme {
selection_bg: rgb(0x26, 0x23, 0x3a),
selection_fg: rgb(0xe0, 0xde, 0xf4),
accent: rgb(0x9c, 0xcf, 0xd8),
dim: rgb(0x6e, 0x6a, 0x86),
border: rgb(0x6e, 0x6a, 0x86),
ok: rgb(0x31, 0x74, 0x8f),
fail: rgb(0xeb, 0x6f, 0x92),
project: rgb(0xc4, 0xa7, 0xe7),
command: rgb(0xe0, 0xde, 0xf4),
header: rgb(0xf6, 0xc1, 0x77),
controls: rgb(0xf6, 0xc1, 0x77),
directory: rgb(0x6e, 0x6a, 0x86),
tags: rgb(0xe0, 0xde, 0xf4),
}
}

fn solarized_theme() -> Theme {
Theme {
selection_bg: rgb(0x07, 0x36, 0x42),
selection_fg: rgb(0x93, 0xa1, 0xa1),
accent: rgb(0x2a, 0xa1, 0x98),
dim: rgb(0x58, 0x6e, 0x75),
border: rgb(0x58, 0x6e, 0x75),
ok: rgb(0x85, 0x99, 0x00),
fail: rgb(0xdc, 0x32, 0x2f),
project: rgb(0x26, 0x8b, 0xd2),
command: rgb(0x83, 0x94, 0x96),
header: rgb(0x6c, 0x71, 0xc4),
controls: rgb(0x6c, 0x71, 0xc4),
directory: rgb(0x58, 0x6e, 0x75),
tags: rgb(0x83, 0x94, 0x96),
}
}

fn kanagawa_theme() -> Theme {
Theme {
selection_bg: rgb(0x2d, 0x4f, 0x67),
selection_fg: rgb(0xdc, 0xd7, 0xba),
accent: rgb(0x7f, 0xb4, 0xca),
dim: rgb(0x54, 0x54, 0x6d),
border: rgb(0x54, 0x54, 0x6d),
ok: rgb(0x98, 0xbb, 0x6c),
fail: rgb(0xc3, 0x40, 0x43),
project: rgb(0x7e, 0x9c, 0xd8),
command: rgb(0xdc, 0xd7, 0xba),
header: rgb(0x95, 0x7f, 0xb8),
controls: rgb(0x95, 0x7f, 0xb8),
directory: rgb(0x54, 0x54, 0x6d),
tags: rgb(0xdc, 0xd7, 0xba),
}
}

pub fn builtin_names() -> &'static [&'static str] {
&[
"default",
Expand All @@ -164,6 +254,11 @@ pub fn builtin_names() -> &'static [&'static str] {
"frappe",
"macchiato",
"mocha",
"dracula",
"tokyonight",
"rosepine",
"solarized",
"kanagawa",
]
}

Expand All @@ -176,6 +271,11 @@ pub fn builtin(name: &str) -> Option<Theme> {
"frappe" => Some(frappe_theme()),
"macchiato" => Some(macchiato_theme()),
"mocha" => Some(mocha_theme()),
"dracula" => Some(dracula_theme()),
"tokyonight" => Some(tokyonight_theme()),
"rosepine" => Some(rosepine_theme()),
"solarized" => Some(solarized_theme()),
"kanagawa" => Some(kanagawa_theme()),
_ => None,
}
}
Expand Down Expand Up @@ -335,16 +435,43 @@ mod tests {
assert!(builtin("MOCHA").is_some());
}

#[test]
fn builtin_dracula_values() {
let t = builtin("dracula").unwrap();
assert_eq!(t.selection_bg, Color::Rgb(0x44, 0x47, 0x5a));
assert_eq!(t.fail, Color::Rgb(0xff, 0x55, 0x55));
}

#[test]
fn builtin_kanagawa_values() {
let t = builtin("kanagawa").unwrap();
assert_eq!(t.selection_bg, Color::Rgb(0x2d, 0x4f, 0x67));
assert_eq!(t.project, Color::Rgb(0x7e, 0x9c, 0xd8));
}

#[test]
fn builtin_kanagawa_case_insensitive() {
assert!(builtin("Kanagawa").is_some());
}

#[test]
fn builtin_tokyonight_case_insensitive() {
assert!(builtin("TokyoNight").is_some());
}

#[test]
fn builtin_unknown_is_none() {
assert!(builtin("nope").is_none());
}

#[test]
fn builtin_names_has_seven() {
assert_eq!(builtin_names().len(), 7);
fn builtin_names_has_twelve() {
assert_eq!(builtin_names().len(), 12);
assert!(builtin_names().contains(&"default"));
assert!(builtin_names().contains(&"mocha"));
assert!(builtin_names().contains(&"dracula"));
assert!(builtin_names().contains(&"solarized"));
assert!(builtin_names().contains(&"kanagawa"));
}

#[test]
Expand All @@ -365,9 +492,12 @@ mod tests {
.iter()
.map(|n| builtin(n).unwrap())
.collect();
assert_eq!(themes.len(), 7);
assert_eq!(themes.len(), 12);
let mocha = builtin("mocha").unwrap();
let latte = builtin("latte").unwrap();
assert_ne!(mocha, latte);
let dracula = builtin("dracula").unwrap();
let tokyonight = builtin("tokyonight").unwrap();
assert_ne!(dracula, tokyonight);
}
}