@@ -13,6 +13,7 @@ import (
1313 "github.com/charmbracelet/crush/internal/exp/diffview"
1414 "github.com/charmbracelet/glamour/v2/ansi"
1515 "github.com/charmbracelet/lipgloss/v2"
16+ "github.com/charmbracelet/x/exp/charmtone"
1617 "github.com/lucasb-eyer/go-colorful"
1718 "github.com/rivo/uniseg"
1819)
@@ -191,13 +192,12 @@ func (t *Theme) buildStyles() *Styles {
191192 },
192193 },
193194
194− // TODO: update using the colors and add colors if missing
195195 Markdown: ansi.StyleConfig{
196196 Document: ansi.StyleBlock{
197197 StylePrimitive: ansi.StylePrimitive{
198198 // BlockPrefix: "\n",
199199 // BlockSuffix: "\n",
200− Color: stringPtr("252"),
200+ Color: stringPtr(charmtone.Smoke.Hex()),
201201 },
202202 // Margin: uintPtr(defaultMargin),
203203 },
@@ -212,7 +212,7 @@ func (t *Theme) buildStyles() *Styles {
212212 Heading: ansi.StyleBlock{
213213 StylePrimitive: ansi.StylePrimitive{
214214 BlockSuffix: "\n",
215− Color: stringPtr("39"),
215+ Color: stringPtr(charmtone.Malibu.Hex()),
216216 Bold: boolPtr(true),
217217 },
218218 },
@@ -220,8 +220,8 @@ func (t *Theme) buildStyles() *Styles {
220220 StylePrimitive: ansi.StylePrimitive{
221221 Prefix: " ",
222222 Suffix: " ",
223− Color: stringPtr("228"),
224− BackgroundColor: stringPtr("63"),
223+ Color: stringPtr(charmtone.Zest.Hex()),
224+ BackgroundColor: stringPtr(charmtone.Charple.Hex()),
225225 Bold: boolPtr(true),
226226 },
227227 },
@@ -248,7 +248,7 @@ func (t *Theme) buildStyles() *Styles {
248248 H6: ansi.StyleBlock{
249249 StylePrimitive: ansi.StylePrimitive{
250250 Prefix: "###### ",
251− Color: stringPtr("35"),
251+ Color: stringPtr(charmtone.Guac.Hex()),
252252 Bold: boolPtr(false),
253253 },
254254 },
@@ -262,7 +262,7 @@ func (t *Theme) buildStyles() *Styles {
262262 Bold: boolPtr(true),
263263 },
264264 HorizontalRule: ansi.StylePrimitive{
265− Color: stringPtr("240"),
265+ Color: stringPtr(charmtone.Charcoal.Hex()),
266266 Format: "\n--------\n",
267267 },
268268 Item: ansi.StylePrimitive{
@@ -277,117 +277,117 @@ func (t *Theme) buildStyles() *Styles {
277277 Unticked: "[ ] ",
278278 },
279279 Link: ansi.StylePrimitive{
280− Color: stringPtr("30"),
280+ Color: stringPtr(charmtone.Zinc.Hex()),
281281 Underline: boolPtr(true),
282282 },
283283 LinkText: ansi.StylePrimitive{
284− Color: stringPtr("35"),
284+ Color: stringPtr(charmtone.Guac.Hex()),
285285 Bold: boolPtr(true),
286286 },
287287 Image: ansi.StylePrimitive{
288− Color: stringPtr("212"),
288+ Color: stringPtr(charmtone.Cheeky.Hex()),
289289 Underline: boolPtr(true),
290290 },
291291 ImageText: ansi.StylePrimitive{
292− Color: stringPtr("243"),
292+ Color: stringPtr(charmtone.Squid.Hex()),
293293 Format: "Image: {{.text}} →",
294294 },
295295 Code: ansi.StyleBlock{
296296 StylePrimitive: ansi.StylePrimitive{
297297 Prefix: " ",
298298 Suffix: " ",
299− Color: stringPtr("203"),
300− BackgroundColor: stringPtr("236"),
299+ Color: stringPtr(charmtone.Coral.Hex()),
300+ BackgroundColor: stringPtr(charmtone.Charcoal.Hex()),
301301 },
302302 },
303303 CodeBlock: ansi.StyleCodeBlock{
304304 StyleBlock: ansi.StyleBlock{
305305 StylePrimitive: ansi.StylePrimitive{
306− Color: stringPtr("244"),
306+ Color: stringPtr(charmtone.Charcoal.Hex()),
307307 },
308308 Margin: uintPtr(defaultMargin),
309309 },
310310 Chroma: &ansi.Chroma{
311311 Text: ansi.StylePrimitive{
312− Color: stringPtr("#C4C4C4"),
312+ Color: stringPtr(charmtone.Smoke.Hex()),
313313 },
314314 Error: ansi.StylePrimitive{
315− Color: stringPtr("#F1F1F1"),
316− BackgroundColor: stringPtr("#F05B5B"),
315+ Color: stringPtr(charmtone.Butter.Hex()),
316+ BackgroundColor: stringPtr(charmtone.Sriracha.Hex()),
317317 },
318318 Comment: ansi.StylePrimitive{
319− Color: stringPtr("#676767"),
319+ Color: stringPtr(charmtone.Oyster.Hex()),
320320 },
321321 CommentPreproc: ansi.StylePrimitive{
322− Color: stringPtr("#FF875F"),
322+ Color: stringPtr(charmtone.Bengal.Hex()),
323323 },
324324 Keyword: ansi.StylePrimitive{
325− Color: stringPtr("#00AAFF"),
325+ Color: stringPtr(charmtone.Malibu.Hex()),
326326 },
327327 KeywordReserved: ansi.StylePrimitive{
328− Color: stringPtr("#FF5FD2"),
328+ Color: stringPtr(charmtone.Pony.Hex()),
329329 },
330330 KeywordNamespace: ansi.StylePrimitive{
331− Color: stringPtr("#FF5F87"),
331+ Color: stringPtr(charmtone.Pony.Hex()),
332332 },
333333 KeywordType: ansi.StylePrimitive{
334− Color: stringPtr("#6E6ED8"),
334+ Color: stringPtr(charmtone.Guppy.Hex()),
335335 },
336336 Operator: ansi.StylePrimitive{
337− Color: stringPtr("#EF8080"),
337+ Color: stringPtr(charmtone.Salmon.Hex()),
338338 },
339339 Punctuation: ansi.StylePrimitive{
340− Color: stringPtr("#E8E8A8"),
340+ Color: stringPtr(charmtone.Zest.Hex()),
341341 },
342342 Name: ansi.StylePrimitive{
343− Color: stringPtr("#C4C4C4"),
343+ Color: stringPtr(charmtone.Smoke.Hex()),
344344 },
345345 NameBuiltin: ansi.StylePrimitive{
346− Color: stringPtr("#FF8EC7"),
346+ Color: stringPtr(charmtone.Cheeky.Hex()),
347347 },
348348 NameTag: ansi.StylePrimitive{
349− Color: stringPtr("#B083EA"),
349+ Color: stringPtr(charmtone.Mauve.Hex()),
350350 },
351351 NameAttribute: ansi.StylePrimitive{
352− Color: stringPtr("#7A7AE6"),
352+ Color: stringPtr(charmtone.Hazy.Hex()),
353353 },
354354 NameClass: ansi.StylePrimitive{
355− Color: stringPtr("#F1F1F1"),
355+ Color: stringPtr(charmtone.Salt.Hex()),
356356 Underline: boolPtr(true),
357357 Bold: boolPtr(true),
358358 },
359359 NameDecorator: ansi.StylePrimitive{
360− Color: stringPtr("#FFFF87"),
360+ Color: stringPtr(charmtone.Citron.Hex()),
361361 },
362362 NameFunction: ansi.StylePrimitive{
363− Color: stringPtr("#00D787"),
363+ Color: stringPtr(charmtone.Guac.Hex()),
364364 },
365365 LiteralNumber: ansi.StylePrimitive{
366− Color: stringPtr("#6EEFC0"),
366+ Color: stringPtr(charmtone.Julep.Hex()),
367367 },
368368 LiteralString: ansi.StylePrimitive{
369− Color: stringPtr("#C69669"),
369+ Color: stringPtr(charmtone.Cumin.Hex()),
370370 },
371371 LiteralStringEscape: ansi.StylePrimitive{
372− Color: stringPtr("#AFFFD7"),
372+ Color: stringPtr(charmtone.Bok.Hex()),
373373 },
374374 GenericDeleted: ansi.StylePrimitive{
375− Color: stringPtr("#FD5B5B"),
375+ Color: stringPtr(charmtone.Coral.Hex()),
376376 },
377377 GenericEmph: ansi.StylePrimitive{
378378 Italic: boolPtr(true),
379379 },
380380 GenericInserted: ansi.StylePrimitive{
381− Color: stringPtr("#00D787"),
381+ Color: stringPtr(charmtone.Guac.Hex()),
382382 },
383383 GenericStrong: ansi.StylePrimitive{
384384 Bold: boolPtr(true),
385385 },
386386 GenericSubheading: ansi.StylePrimitive{
387− Color: stringPtr("#777777"),
387+ Color: stringPtr(charmtone.Squid.Hex()),
388388 },
389389 Background: ansi.StylePrimitive{
390− BackgroundColor: stringPtr("#373737"),
390+ BackgroundColor: stringPtr(charmtone.Charcoal.Hex()),
391391 },
392392 },
393393 },