remove duplicate theme aliases (gruvbox, nord-frost); add 4 new themes: one-dark, everforest, github-dark, catppuccin-macchiato

This commit is contained in:
vrubelroman 2026-04-27 20:19:43 +03:00
parent c35fbad5e3
commit d38945f595
3 changed files with 167 additions and 7 deletions

View file

@ -162,12 +162,14 @@ icon_mode = "auto" # auto | nerd | ascii
Built-in themes (use `T` to cycle or set `ui.theme` in config):
- `catppuccin-mocha` (default)
- `catppuccin-macchiato`
- `catppuccin-lavender`
- `tokyo-night`
- `gruvbox-dark`
- `gruvbox`
- `nord-frost`
- `nord`
- `one-dark`
- `everforest`
- `github-dark`
- `ayu-dark`
- `breeze`
- `cyberpunk`

View file

@ -47,12 +47,14 @@ type Palette struct {
var builtInThemes = []string{
"catppuccin-mocha",
"catppuccin-macchiato",
"catppuccin-lavender",
"tokyo-night",
"gruvbox-dark",
"gruvbox",
"nord-frost",
"nord",
"one-dark",
"everforest",
"github-dark",
"ayu-dark",
"breeze",
"cyberpunk",
@ -204,7 +206,7 @@ func Resolve(name string) (Palette, error) {
FooterKey: lipgloss.Color("#73DACA"),
}, nil
case "gruvbox-dark", "gruvbox":
case "gruvbox-dark":
return Palette{
Name: name,
Background: lipgloss.Color("#1D2021"),
@ -243,7 +245,7 @@ func Resolve(name string) (Palette, error) {
FooterKey: lipgloss.Color("#8EC07C"),
}, nil
case "nord-frost", "nord":
case "nord":
return Palette{
Name: name,
Background: lipgloss.Color("#2E3440"),
@ -282,6 +284,162 @@ func Resolve(name string) (Palette, error) {
FooterKey: lipgloss.Color("#8FBCBB"),
}, nil
case "one-dark":
return Palette{
Name: "one-dark",
Background: lipgloss.Color("#282C34"),
Panel: lipgloss.Color("#21252B"),
PanelInactive: lipgloss.Color("#1B1D23"),
PanelElevated: lipgloss.Color("#2C313A"),
StatusBar: lipgloss.Color("#21252B"),
Footer: lipgloss.Color("#282C34"),
Border: lipgloss.Color("#3B4048"),
BorderActive: lipgloss.Color("#61AFEF"),
Text: lipgloss.Color("#ABB2BF"),
Muted: lipgloss.Color("#5C6370"),
Accent: lipgloss.Color("#61AFEF"),
Info: lipgloss.Color("#56B6C2"),
Success: lipgloss.Color("#98C379"),
Selection: lipgloss.Color("#3E4451"),
Hover: lipgloss.Color("#333841"),
Marked: lipgloss.Color("#E06C75"),
Warning: lipgloss.Color("#E5C07B"),
Danger: lipgloss.Color("#E06C75"),
ActivePath: lipgloss.Color("#56B6C2"),
ConfirmButton: lipgloss.Color("#98C379"),
CancelButton: lipgloss.Color("#E06C75"),
ProgressFill: lipgloss.Color("#61AFEF"),
ProgressEmpty: lipgloss.Color("#3B4048"),
HelpNav: lipgloss.Color("#61AFEF"),
HelpPanels: lipgloss.Color("#E5C07B"),
HelpDialogs: lipgloss.Color("#C678DD"),
HelpMouse: lipgloss.Color("#E06C75"),
Folder: lipgloss.Color("#61AFEF"),
TextFile: lipgloss.Color("#98C379"),
ConfigFile: lipgloss.Color("#E5C07B"),
ExecFile: lipgloss.Color("#D19A66"),
ImageFile: lipgloss.Color("#56B6C2"),
BinaryFile: lipgloss.Color("#C678DD"),
FooterKey: lipgloss.Color("#56B6C2"),
}, nil
case "everforest":
return Palette{
Name: "everforest",
Background: lipgloss.Color("#2D353B"),
Panel: lipgloss.Color("#272E33"),
PanelInactive: lipgloss.Color("#232A2E"),
PanelElevated: lipgloss.Color("#333C43"),
StatusBar: lipgloss.Color("#232A2E"),
Footer: lipgloss.Color("#2D353B"),
Border: lipgloss.Color("#475258"),
BorderActive: lipgloss.Color("#A7C080"),
Text: lipgloss.Color("#D3C6AA"),
Muted: lipgloss.Color("#859289"),
Accent: lipgloss.Color("#A7C080"),
Info: lipgloss.Color("#83C092"),
Success: lipgloss.Color("#A7C080"),
Selection: lipgloss.Color("#3A454A"),
Hover: lipgloss.Color("#364147"),
Marked: lipgloss.Color("#E67E80"),
Warning: lipgloss.Color("#DBBC7F"),
Danger: lipgloss.Color("#E67E80"),
ActivePath: lipgloss.Color("#83C092"),
ConfirmButton: lipgloss.Color("#A7C080"),
CancelButton: lipgloss.Color("#E67E80"),
ProgressFill: lipgloss.Color("#A7C080"),
ProgressEmpty: lipgloss.Color("#475258"),
HelpNav: lipgloss.Color("#A7C080"),
HelpPanels: lipgloss.Color("#DBBC7F"),
HelpDialogs: lipgloss.Color("#D699B6"),
HelpMouse: lipgloss.Color("#E67E80"),
Folder: lipgloss.Color("#A7C080"),
TextFile: lipgloss.Color("#D3C6AA"),
ConfigFile: lipgloss.Color("#DBBC7F"),
ExecFile: lipgloss.Color("#E69875"),
ImageFile: lipgloss.Color("#83C092"),
BinaryFile: lipgloss.Color("#D699B6"),
FooterKey: lipgloss.Color("#83C092"),
}, nil
case "github-dark":
return Palette{
Name: "github-dark",
Background: lipgloss.Color("#0D1117"),
Panel: lipgloss.Color("#161B22"),
PanelInactive: lipgloss.Color("#1C2128"),
PanelElevated: lipgloss.Color("#21262D"),
StatusBar: lipgloss.Color("#1C2128"),
Footer: lipgloss.Color("#0D1117"),
Border: lipgloss.Color("#30363D"),
BorderActive: lipgloss.Color("#58A6FF"),
Text: lipgloss.Color("#E6EDF3"),
Muted: lipgloss.Color("#8B949E"),
Accent: lipgloss.Color("#58A6FF"),
Info: lipgloss.Color("#39D353"),
Success: lipgloss.Color("#3FB950"),
Selection: lipgloss.Color("#21262D"),
Hover: lipgloss.Color("#262C36"),
Marked: lipgloss.Color("#F85149"),
Warning: lipgloss.Color("#D29922"),
Danger: lipgloss.Color("#F85149"),
ActivePath: lipgloss.Color("#39D353"),
ConfirmButton: lipgloss.Color("#3FB950"),
CancelButton: lipgloss.Color("#F85149"),
ProgressFill: lipgloss.Color("#58A6FF"),
ProgressEmpty: lipgloss.Color("#30363D"),
HelpNav: lipgloss.Color("#58A6FF"),
HelpPanels: lipgloss.Color("#D29922"),
HelpDialogs: lipgloss.Color("#BC8CFF"),
HelpMouse: lipgloss.Color("#F85149"),
Folder: lipgloss.Color("#58A6FF"),
TextFile: lipgloss.Color("#7EE787"),
ConfigFile: lipgloss.Color("#D29922"),
ExecFile: lipgloss.Color("#F0883E"),
ImageFile: lipgloss.Color("#39D353"),
BinaryFile: lipgloss.Color("#BC8CFF"),
FooterKey: lipgloss.Color("#39D353"),
}, nil
case "catppuccin-macchiato":
return Palette{
Name: "catppuccin-macchiato",
Background: lipgloss.Color("#181926"),
Panel: lipgloss.Color("#1E2030"),
PanelInactive: lipgloss.Color("#24273A"),
PanelElevated: lipgloss.Color("#2A2E3F"),
StatusBar: lipgloss.Color("#24273A"),
Footer: lipgloss.Color("#181926"),
Border: lipgloss.Color("#363A4F"),
BorderActive: lipgloss.Color("#C6A0F6"),
Text: lipgloss.Color("#CAD3F5"),
Muted: lipgloss.Color("#A5ADCB"),
Accent: lipgloss.Color("#C6A0F6"),
Info: lipgloss.Color("#91D7E3"),
Success: lipgloss.Color("#A6DA95"),
Selection: lipgloss.Color("#363A4F"),
Hover: lipgloss.Color("#2E3248"),
Marked: lipgloss.Color("#ED8796"),
Warning: lipgloss.Color("#F5A97F"),
Danger: lipgloss.Color("#ED8796"),
ActivePath: lipgloss.Color("#91D7E3"),
ConfirmButton: lipgloss.Color("#A6DA95"),
CancelButton: lipgloss.Color("#ED8796"),
ProgressFill: lipgloss.Color("#C6A0F6"),
ProgressEmpty: lipgloss.Color("#363A4F"),
HelpNav: lipgloss.Color("#C6A0F6"),
HelpPanels: lipgloss.Color("#F5A97F"),
HelpDialogs: lipgloss.Color("#C6A0F6"),
HelpMouse: lipgloss.Color("#ED8796"),
Folder: lipgloss.Color("#C6A0F6"),
TextFile: lipgloss.Color("#A6DA95"),
ConfigFile: lipgloss.Color("#F5A97F"),
ExecFile: lipgloss.Color("#EE99A0"),
ImageFile: lipgloss.Color("#91D7E3"),
BinaryFile: lipgloss.Color("#C6A0F6"),
FooterKey: lipgloss.Color("#91D7E3"),
}, nil
case "ayu-dark":
return Palette{
Name: "ayu-dark",

View file

@ -4,7 +4,7 @@ right_path = ''
[ui]
app_title = 'vcom'
theme = 'ayu-dark'
theme = 'eldritch'
icon_mode = 'auto'
show_title_bar = true
show_footer = true