feat: adapt v2 colors and lipgloss integration

Author: NachoVazquez

lazynx/internal/tui/components/help.go

@@ -6,6 +6,7 @@ import (
 	"github.com/charmbracelet/bubbles/v2/key"
 	tea "github.com/charmbracelet/bubbletea/v2"
 	"github.com/charmbracelet/lipgloss/v2"
+	"github.com/lazyengs/lazynx/internal/tui/utils"
 )
 
 type HelpComponent struct {
@@ -26,7 +27,7 @@ func (h *HelpComponent) Init() tea.Cmd {
 }
 
 func (h *HelpComponent) SetBindings(keys []key.Binding) {
-	h.keys = removeDuplicateBindings(keys)
+	h.keys = utils.RemoveDuplicateBindings(keys)
 }
 
 func (h *HelpComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
@@ -41,33 +42,6 @@ func (h *HelpComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	return h, nil
 }
 
-func removeDuplicateBindings(bindings []key.Binding) []key.Binding {
-	seen := make(map[string]struct{})
-	result := make([]key.Binding, 0, len(bindings))
-
-	// Process bindings in reverse order
-	for i := len(bindings) - 1; i >= 0; i-- {
-		b := bindings[i]
-		k := strings.Join(b.Keys(), " ")
-		if _, ok := seen[k]; ok {
-			// duplicate, skip
-			continue
-		}
-		seen[k] = struct{}{}
-		// Add to the beginning of result to maintain original order
-		result = append([]key.Binding{b}, result...)
-	}
-
-	return result
-}
-
-func min(a, b int) int {
-	if a < b {
-		return a
-	}
-	return b
-}
-
 func (h *HelpComponent) renderContent() string {
 	baseStyle := lipgloss.NewStyle()
 

lazynx/internal/tui/tui.go

@@ -267,5 +267,9 @@ func (m ProgramModel) View() string {
 }
 
 func Create(client *nxlsclient.Client, logger *zap.SugaredLogger, workspacePath string) *tea.Program {
-	return tea.NewProgram(createProgram(client, logger, workspacePath), tea.WithAltScreen(), tea.WithKeyboardEnhancements(tea.WithUniformKeyLayout))
+	return tea.NewProgram(
+		createProgram(client, logger, workspacePath),
+		tea.WithAltScreen(),
+		tea.WithKeyboardEnhancements(tea.WithUniformKeyLayout),
+		tea.WithGraphemeClustering())
 }

lazynx/internal/tui/utils/keymap.go

@@ -2,6 +2,7 @@ package utils
 
 import (
 	"reflect"
+	"strings"
 
 	"github.com/charmbracelet/bubbles/v2/key"
 )
@@ -23,3 +24,23 @@ func KeyMapToSlice(keymap any) []key.Binding {
 	}
 	return bindings
 }
+
+func RemoveDuplicateBindings(bindings []key.Binding) []key.Binding {
+	seen := make(map[string]struct{})
+	result := make([]key.Binding, 0, len(bindings))
+
+	// Process bindings in reverse order
+	for i := len(bindings) - 1; i >= 0; i-- {
+		b := bindings[i]
+		k := strings.Join(b.Keys(), " ")
+		if _, ok := seen[k]; ok {
+			// duplicate, skip
+			continue
+		}
+		seen[k] = struct{}{}
+		// Add to the beginning of result to maintain original order
+		result = append([]key.Binding{b}, result...)
+	}
+
+	return result
+}