set a fzf color scheme from fang's colors to make it fit in

Author: notnmeyer

cmd/picker.go

@@ -106,6 +106,24 @@ func parsePickerOutput(s string, numRows int) (key string, rowIdx int, err error
 	return keyLine, rowIdx, nil
 }
 
+// build an fzf --color spec that matches the CLI's fang color scheme:
+// the table column header color is reused for accents (prompt, pointer,
+// matches, etc.) and the comment color for info text. base scheme
+// follows the detected terminal background.
+func pickerColorSpec() string {
+	cs := fangColorScheme()
+	base := "dark"
+	if !isDarkBackground() {
+		base = "light"
+	}
+	accent := hexColor(cs.Title)
+	dim := hexColor(cs.Comment)
+	return fmt.Sprintf(
+		"%s,header:%s,prompt:%s,pointer:%s,marker:%s,spinner:%s,hl:%s,hl+:%s,info:%s",
+		base, accent, accent, accent, accent, accent, accent, accent, dim,
+	)
+}
+
 func renderPickerHeader(bindings []pickBinding) string {
 	parts := make([]string, len(bindings))
 	for i, b := range bindings {
@@ -135,6 +153,7 @@ func runPicker(headers []string, rows [][]string, bindings []pickBinding) error
 		"--with-nth", "2..",
 		"--header", renderPickerHeader(bindings),
 		"--header-first",
+		"--color", pickerColorSpec(),
 	}
 
 	expect := make([]string, 0, len(bindings)-1)

cmd/styles.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+	"image/color"
 	"io"
 	"os"
 	"strings"
@@ -14,14 +15,25 @@ import (
 	"github.com/charmbracelet/x/term"
 )
 
-var fangColorScheme = sync.OnceValue(func() fang.ColorScheme {
-	isDark := true
-	if term.IsTerminal(os.Stdout.Fd()) {
-		isDark = lipgloss.HasDarkBackground(os.Stdin, os.Stdout)
+var isDarkBackground = sync.OnceValue(func() bool {
+	if !term.IsTerminal(os.Stdout.Fd()) {
+		return true
 	}
-	return fang.DefaultColorScheme(lipgloss.LightDark(isDark))
+	return lipgloss.HasDarkBackground(os.Stdin, os.Stdout)
+})
+
+var fangColorScheme = sync.OnceValue(func() fang.ColorScheme {
+	return fang.DefaultColorScheme(lipgloss.LightDark(isDarkBackground()))
 })
 
+func hexColor(c color.Color) string {
+	if c == nil {
+		return ""
+	}
+	r, g, b, _ := c.RGBA()
+	return fmt.Sprintf("#%02x%02x%02x", uint8(r>>8), uint8(g>>8), uint8(b>>8))
+}
+
 type styledTable struct {
 	out io.Writer
 	t   *table.Table