Skip to content
This repository was archived by the owner on Sep 18, 2025. It is now read-only.

Commit 67529e5

Browse files
meowgorithmkujtimiihoxha
authored andcommitted
fix: re-reference Charmtone colors directly in theme
Ayman fixed a bug upstream in /x/ansi to make setBackgroundColor work as expected.
1 parent f230c31 commit 67529e5

3 files changed

Lines changed: 27 additions & 20 deletions

File tree

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ require (
1414
github.com/catppuccin/go v0.3.0
1515
github.com/charlievieth/fastwalk v1.0.11
1616
github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250526131538-b3f0c9e42318
17-
github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.3.0.20250526132317-434f93986a5c
17+
github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.3.0.20250602154956-43689cfc0174
1818
github.com/charmbracelet/glamour/v2 v2.0.0-20250516160903-6f1e2c8f9ebe
1919
github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1.0.20250523195325-2d1af06b557c
20-
github.com/charmbracelet/x/ansi v0.9.3-0.20250516160309-24eee56f89fa
20+
github.com/charmbracelet/x/ansi v0.9.3-0.20250602153603-fb931ed90413
2121
github.com/charmbracelet/x/exp/charmtone v0.0.0-20250530202730-6ba1785cd7b9
2222
github.com/fsnotify/fsnotify v1.8.0
2323
github.com/go-logfmt/logfmt v0.6.0

go.sum

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@ github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250526131538-b3f0c9e42318
7474
github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250526131538-b3f0c9e42318/go.mod h1:6HamsBKWqEC/FVHuQMHgQL+knPyvHH55HwJDHl/adMw=
7575
github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.3.0.20250526132317-434f93986a5c h1:EoW1x1K2EDKYw1D7raqZqWKnwk21IZVpYqLHQVhz1ZU=
7676
github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.3.0.20250526132317-434f93986a5c/go.mod h1:sXuGtrlVJo43r1fVGBM06E7PPb16oBl8rDRr6YgQOck=
77+
github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.3.0.20250602154534-5681225ad367 h1:X+w3YtXyLG3oguOKXvcDT8jQP856YLQsq6SwTE+gqTk=
78+
github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.3.0.20250602154534-5681225ad367/go.mod h1:oOn1YZGZyJHxJfh4sFAna9vDzxJRNuErLETr/lnlB/I=
79+
github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.3.0.20250602154956-43689cfc0174 h1:TlVW+df0rdU/osP0O8DIVS9WFOAzXe3nuiMwJR4n+CA=
80+
github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.3.0.20250602154956-43689cfc0174/go.mod h1:oOn1YZGZyJHxJfh4sFAna9vDzxJRNuErLETr/lnlB/I=
7781
github.com/charmbracelet/colorprofile v0.3.1 h1:k8dTHMd7fgw4bnFd7jXTLZrSU/CQrKnL3m+AxCzDz40=
7882
github.com/charmbracelet/colorprofile v0.3.1/go.mod h1:/GkGusxNs8VB/RSOh3fu0TJmQ4ICMMPApIIVn0KszZ0=
7983
github.com/charmbracelet/glamour/v2 v2.0.0-20250516160903-6f1e2c8f9ebe h1:i6ce4CcAlPpTj2ER69m1DBeLZ3RRcHnKExuwhKa3GfY=
@@ -82,6 +86,8 @@ github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1.0.20250523195325-2d1af06b557c
8286
github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1.0.20250523195325-2d1af06b557c/go.mod h1:EJWvaCrhOhNGVZMvcjc0yVryl4qqpMs8tz0r9WyEkdQ=
8387
github.com/charmbracelet/x/ansi v0.9.3-0.20250516160309-24eee56f89fa h1:JU05TLAB6nOEL46bxHDV/+e8umBX32ODsGbVkc7o7bk=
8488
github.com/charmbracelet/x/ansi v0.9.3-0.20250516160309-24eee56f89fa/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE=
89+
github.com/charmbracelet/x/ansi v0.9.3-0.20250602153603-fb931ed90413 h1:L07QkDqRF274IZ2UJ/mCTL8DR95efU9BNWLYCDXEjvQ=
90+
github.com/charmbracelet/x/ansi v0.9.3-0.20250602153603-fb931ed90413/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE=
8591
github.com/charmbracelet/x/cellbuf v0.0.14-0.20250516160309-24eee56f89fa h1:lphz0Z3rsiOtMYiz8axkT24i9yFiueDhJbzyNUADmME=
8692
github.com/charmbracelet/x/cellbuf v0.0.14-0.20250516160309-24eee56f89fa/go.mod h1:xBlh2Yi3DL3zy/2n15kITpg0YZardf/aa/hgUaIM6Rk=
8793
github.com/charmbracelet/x/exp/charmtone v0.0.0-20250530202730-6ba1785cd7b9 h1:f6tG7ApqIvXTpgF6MZ+C4Ga7669eiW9BsMkXEjDFHfY=

internal/tui/styles/crush.go

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,33 +10,34 @@ func NewCrushTheme() *Theme {
1010
Name: "crush",
1111
IsDark: true,
1212

13-
Primary: lipgloss.Color(charmtone.Charple.Hex()),
14-
Secondary: lipgloss.Color(charmtone.Dolly.Hex()),
15-
Tertiary: lipgloss.Color(charmtone.Bok.Hex()),
16-
Accent: lipgloss.Color(charmtone.Zest.Hex()),
13+
Primary: charmtone.Charple,
14+
Secondary: charmtone.Dolly,
15+
Tertiary: charmtone.Bok,
16+
Accent: charmtone.Zest,
1717

18-
Blue: lipgloss.Color(charmtone.Malibu.Hex()),
18+
Blue: lipgloss.Color(charmtone.Malibu.Hex()),
19+
PrimaryLight: charmtone.Hazy,
1920

2021
// Backgrounds
21-
BgBase: lipgloss.Color(charmtone.Pepper.Hex()),
22-
BgSubtle: lipgloss.Color(charmtone.Charcoal.Hex()),
23-
BgOverlay: lipgloss.Color(charmtone.Iron.Hex()),
22+
BgBase: charmtone.Pepper,
23+
BgSubtle: charmtone.Charcoal,
24+
BgOverlay: charmtone.Iron,
2425

2526
// Foregrounds
26-
FgBase: lipgloss.Color(charmtone.Ash.Hex()),
27-
FgMuted: lipgloss.Color(charmtone.Squid.Hex()),
28-
FgSubtle: lipgloss.Color(charmtone.Oyster.Hex()),
29-
FgSelected: lipgloss.Color(charmtone.Salt.Hex()),
27+
FgBase: charmtone.Ash,
28+
FgMuted: charmtone.Squid,
29+
FgSubtle: charmtone.Oyster,
30+
FgSelected: charmtone.Salt,
3031

3132
// Borders
32-
Border: lipgloss.Color(charmtone.Charcoal.Hex()),
33-
BorderFocus: lipgloss.Color(charmtone.Charple.Hex()),
33+
Border: charmtone.Charcoal,
34+
BorderFocus: charmtone.Charple,
3435

3536
// Status
36-
Success: lipgloss.Color(charmtone.Guac.Hex()),
37-
Error: lipgloss.Color(charmtone.Sriracha.Hex()),
38-
Warning: lipgloss.Color(charmtone.Uni.Hex()),
39-
Info: lipgloss.Color(charmtone.Malibu.Hex()),
37+
Success: charmtone.Guac,
38+
Error: charmtone.Sriracha,
39+
Warning: charmtone.Uni,
40+
Info: charmtone.Malibu,
4041

4142
// TODO: fix this.
4243
SyntaxBg: lipgloss.Color("#1C1C1F"),

0 commit comments

Comments
 (0)