simplify mako impl

cmd/mako.go

@@ -13,6 +13,7 @@ var makoCmd = &cobra.Command{
 	},
 }
 
+
 var (
   number int
 )

go.mod

@@ -3,16 +3,23 @@ module git.dayl.in/daylin/hyprman
 go 1.22.2
 
 require (
+	github.com/charmbracelet/lipgloss v0.11.0
 	github.com/goccy/go-yaml v1.11.3
 	github.com/ivanpirog/coloredcobra v1.0.1
 	github.com/spf13/cobra v1.8.0
 )
 
 require (
+	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
+	github.com/charmbracelet/x/ansi v0.1.2 // indirect
 	github.com/fatih/color v1.17.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
+	github.com/muesli/termenv v0.15.2 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	golang.org/x/sys v0.20.0 // indirect
 	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect

go.sum

@@ -1,3 +1,9 @@
+github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
+github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
+github.com/charmbracelet/lipgloss v0.11.0 h1:UoAcbQ6Qml8hDwSWs0Y1cB5TEQuZkDPH/ZqwWWYTG4g=
+github.com/charmbracelet/lipgloss v0.11.0/go.mod h1:1UdRTH9gYgpcdNN5oBtjbu/IzNKtzVtb7sqN1t9LNn8=
+github.com/charmbracelet/x/ansi v0.1.2 h1:6+LR39uG8DE6zAmbu023YlqjJHkYXDF1z36ZwzO4xZY=
+github.com/charmbracelet/x/ansi v0.1.2/go.mod h1:dk73KoMTT5AX5BsX0KrqhsTqAnhZZoCBjs7dGWp4Ktw=
 github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/daylinmorgan/coloredcobra v0.0.0-20240527152736-9d3ce38297a6 h1:Zst7HlWvQj8LPJ3mhIWtGH2DxqUo6VEq0oekNyAho6M=
@@ -20,11 +26,20 @@ github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
+github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
+github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U=
+github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/muesli/termenv v0.15.2 h1:GohcuySI0QmI3wN8Ok9PtKGkgkFIk7y6Vpb5PvrY+Wo=
+github.com/muesli/termenv v0.15.2/go.mod h1:Epx+iuz8sNs7mNKhxzH4fWXGNpZwUaJKRS1noLXviQ8=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
+github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g=
 github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0=

internal/eww.go

@@ -73,7 +73,7 @@ func (hm *Hyprman) generateEwwClasses() {
 }
 
 func ewwBar1(cmd string) {
-	time.Sleep(2 * time.Second)
+	time.Sleep(3 * time.Second)
 	if err := exec.Command("eww", cmd, "bar1").Run(); err != nil {
 		log.Fatal(err)
 	}

internal/mako.go

@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"log"
 	"os/exec"
+
+	"github.com/charmbracelet/lipgloss"
 )
 
 type MakoHistory struct {
@@ -29,33 +31,72 @@ type MakoNotificationData struct {
 	Data string `json:"data"`
 }
 
-func getHistory() MakoHistory {
-	var history MakoHistory
+type History struct {
+	Notifications []Notifcation
+}
+
+type Notifcation struct {
+	AppName string
+	Summary string
+	Body    string
+}
+
+func (mn MakoNotification) toNotification() Notifcation {
+	var n Notifcation
+	n.AppName = mn.AppName.Data
+	n.Summary = mn.Summary.Data
+	n.Body = mn.Body.Data
+	return n
+}
+
+func (mh MakoHistory) toHistory() History {
+	var h History
+	var notifications []Notifcation
+	for _, mn := range mh.Data[0] {
+		notifications = append(notifications, mn.toNotification())
+	}
+	h.Notifications = notifications
+	return h
+}
+
+func getHistory() History {
+	var makoHistory MakoHistory
 	makoOutput, err := exec.Command("makoctl", "history").CombinedOutput()
 	if err != nil {
 		log.Fatal(err)
 	}
-	json.Unmarshal(makoOutput, &history)
-	return history
-}
-
-func displayNotification(n MakoNotification) {
-	fmt.Println("- ", n.AppName.Data)
-	if len(n.Summary.Data) > 0 {
-		fmt.Println(n.Summary.Data)
-	}
-	if len(n.Body.Data) > 0 {
-		fmt.Println(n.Body.Data)
-	}
+	json.Unmarshal(makoOutput, &makoHistory)
+	return makoHistory.toHistory()
 }
 
 func ListNotifications(number int) {
 	history := getHistory()
-	// TODO: align output ? by app-name
-	for i, notification := range history.Data[0] {
-		displayNotification(notification)
+	for i, n := range history.Notifications {
 		if i > number-1 {
 			break
 		}
+		n.Render()
+	}
+}
+
+func (n Notifcation) Render() {
+	appStyle := lipgloss.NewStyle().
+		Bold(true).
+		Foreground(lipgloss.Color("3")).
+		PaddingTop(1)
+	textStyle := lipgloss.NewStyle().Width(80).PaddingLeft(2).
+		BorderStyle(lipgloss.ThickBorder()).
+		BorderLeft(true)
+
+	fmt.Println(appStyle.Render(n.AppName))
+	if len(n.Summary) > 0 {
+		fmt.Println(textStyle.
+			BorderForeground(lipgloss.Color("14")).
+			Render(n.Summary))
+	}
+	if len(n.Body) > 0 {
+		fmt.Println(textStyle.
+			BorderForeground(lipgloss.Color("2")).
+			Render(n.Body))
 	}
 }