Skip to content

feat/petal/config #537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tauraamui merged 9 commits into from
Jan 8, 2026
Merged

feat/petal/config #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
074de29
chore: define config type with useful constructor pattern
tauraamui Jan 8, 2026
0675c8c
chore: define new collections of palettes in the form of themes
tauraamui Jan 8, 2026
edd39b8
feat: initialise config instances and passed to app
tauraamui Jan 8, 2026
fcc4ae5
chore: alias theme names to avoid requring two module imports
tauraamui Jan 8, 2026
797d51a
chore: set ctxs default bg color from theme and fg as inverse of that
tauraamui Jan 8, 2026
7fc1f11
chore: adjust field names to be more consistent with previous
tauraamui Jan 8, 2026
430f659
chore: make it now v easy to swap between default D/L themes in code
tauraamui Jan 8, 2026
79603b4
chore(tidy): remove unneeded now unused fields
tauraamui Jan 8, 2026
a579252
chore(tidy): remove remaining left over junk
tauraamui Jan 8, 2026
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: 1 addition & 3 deletions colors.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import tauraamui.bobatea as tea
// TODO(tauraamui): consolidate all used colors into a core palette/swatch set
// and alias reference off of that only in the places/models they are used with
// alternative names, instead of here. This file is getting messy and out of hand.
pub const theme_bg_color = matte_black_bg_color
pub const matte_black_bg_color = tea.Color{ 20, 20, 20 }

pub const petal_pink_color = tea.Color{ 245, 191, 243 }
Expand All @@ -21,11 +20,11 @@ pub const status_purple = tea.Color{ 130, 144, 250 }

pub const error_color = petal_red_color

//

pub const matte_black_fg_color = tea.Color.ansi(232)
pub const matte_white_fg_color = tea.Color{ 230, 230, 230 }
pub const bright_off_white_fg_color = tea.Color{ 255, 255, 255 }
// pub const bright_red_fg_color = tea.Color{ 245, 42, 42 }

pub const subtle_text_fg_color = tea.Color.ansi(249)
pub const help_fg_color = tea.Color.ansi(241)
Expand All @@ -34,7 +33,6 @@ pub const selected_highlight_bg_color = tea.Color.ansi(239)

pub const subtle_border_fg_color = petal_pink_color


pub const status_bar_bg_color = tea.Color.ansi(234)
pub const status_file_name_bg_color = tea.Color{ 86, 86, 86 }
pub const status_branch_name_bg_color = tea.Color{ 154, 119, 209 }
Expand Down
39 changes: 39 additions & 0 deletions config.v
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
module cfg

import theme

pub const light_theme_name = theme.light_theme_name
pub const dark_theme_name = theme.dark_theme_name

pub struct Config{
pub:
theme theme.Theme
leader_key string
}

@[params]
pub struct ConfigOptions {
pub:
load_from_path ?string = "~/.config/petal/petal.cfg"
}

pub fn Config.new(opts ConfigOptions) Config {
if path_to_load := opts.load_from_path {
assert path_to_load.len > 0
// do some loading from file here
// return Config{}
}

return Config{
theme: theme.dark_theme
leader_key: ";"
}
}

pub fn (c Config) set_theme(name string) Config {
return Config{
...c
theme: if name == "dark" { theme.dark_theme } else { theme.light_theme }
}
}

7 changes: 5 additions & 2 deletions main.v
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
module main

import tauraamui.bobatea as tea
import palette
import cfg

fn main() {
mut petal_model := PetalModel.new(palette.theme_bg_color, palette.fg_color(palette.theme_bg_color))
// config := cfg.Config.new(load_from_path: none).set_theme(cfg.light_theme_name)
config := cfg.Config.new(load_from_path: none)

mut petal_model := PetalModel.new(config)
mut app := tea.new_program(mut petal_model)
petal_model.app_send = app.send
app.run() or { panic('something went wrong! ${err}') }
Expand Down
23 changes: 11 additions & 12 deletions petal.v
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@ module main

import os
import tauraamui.bobatea as tea
import cfg
import theme
import palette

const dot = '•'

struct PetalModel {
mut:
app_send ?fn (tea.Msg)
theme_fg_color ?tea.Color
theme_bg_color ?tea.Color
config cfg.Config @[required]
theme theme.Theme
first_frame bool
active_screen DebuggableModel // all screens are debuggable to help with live, well... debugging
clear_screen_next_frame bool
Expand All @@ -18,10 +21,10 @@ mut:
last_resize_height int
}

fn PetalModel.new(theme_bg_color ?tea.Color, theme_fg_color ?tea.Color) PetalModel {
fn PetalModel.new(config cfg.Config) PetalModel {
return PetalModel{
theme_bg_color: theme_bg_color
theme_fg_color: theme_fg_color
config: config
theme: config.theme
first_frame: true
active_screen: SplashScreenModel.new()
}
Expand Down Expand Up @@ -99,13 +102,9 @@ fn (mut m PetalModel) update(msg tea.Msg) (tea.Model, ?tea.Cmd) {

fn (mut m PetalModel) view(mut ctx tea.Context) {
if m.first_frame {
if fg_color := m.theme_fg_color {
ctx.set_default_fg_color(fg_color)
}

if bg_color := m.theme_bg_color {
ctx.set_default_bg_color(bg_color)
}
bg_color := m.theme.bg_color
ctx.set_default_fg_color(palette.fg_color(bg_color))
ctx.set_default_bg_color(bg_color)
m.first_frame = false
}
mut screen := m.active_screen
Expand Down
31 changes: 31 additions & 0 deletions theme.v
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
module theme

import tauraamui.bobatea as tea
import palette

pub const dark_theme_name = "dark"
pub const light_theme_name = "light"

pub struct Theme{
pub:
name string @[required]
bg_color tea.Color @[required]
fg_color tea.Color
active_split_divider_color tea.Color @[required]
inactive_split_divider_color tea.Color @[required]
}

pub const dark_theme = Theme{
name: "dark"
bg_color: palette.matte_black_bg_color
active_split_divider_color: palette.petal_pink_color
inactive_split_divider_color: palette.status_bar_bg_color
}

pub const light_theme = Theme{
name: "light"
bg_color: palette.matte_white_fg_color
active_split_divider_color: palette.petal_pink_color
inactive_split_divider_color: palette.status_bar_bg_color
}