.woodpecker.yml

@@ -1,4 +1,4 @@
-steps:
+pipeline:
   vendor:
     image: golang:1.18
     commands:
@@ -8,9 +8,6 @@ steps:
     image: golang:1.18
     commands:
       - make
-      - mkdir release
-      - tar -c -z -f release/build-amd64.tar.gz build/linux-amd64/
-      - tar -c -z -f release/build-arm64.tar.gz build/linux-arm64/
 
   release:
     image: plugins/gitea-release
@@ -19,6 +16,6 @@ steps:
         from_secret: gitnet_api_key
       base_url: https://gitnet.fr
       note:
-      files: release/*
+      files: build/*
     when:
       event: [tag]

Makefile

@@ -1,16 +1,8 @@
-all: linux-amd64 linux-arm64
-
 .ONESHELL:
-linux-amd64:
+all:
 	for i in blocks/*; do
-		GOARCH=amd64 GOOS=linux go build  -ldflags '-s -w' -v -o "build/linux-amd64/$$(basename "$$i")" "$$i/main.go"
-	done
-
-.ONESHELL:
-linux-arm64:
-	for i in blocks/*; do
-		GOARCH=arm64 GOOS=linux go build  -ldflags '-s -w' -v -o "build/linux-arm64/$$(basename "$$i")" "$$i/main.go"
+		go build -ldflags '-s -w' -v -o "build/$$(basename "$$i")" "$$i/main.go"
 	done
 
 clean:
-	rm -fr build/* 2>/dev/null || true
+	rm build/* 2>/dev/null || true

README.md

@@ -55,7 +55,7 @@ interval=1000
 
 ### Date
 
-Show the time using the given format.
+Show the time using given format.
 
 ```
 [time]
@@ -187,18 +187,6 @@ markup=pango
 interval=1
 ```
 
-### Weather
-
-Show the weather of the given location ([https://fr.wttr.in/](https://fr.wttr.in/)).
-
-```
-[weather]
-command=/path/to/weather -loc=Paris -lang=fr
-format=json
-markup=pango
-interval=1800
-```
-
 ### Wireguard toggler
 
 Toggler for wireguard.
@@ -217,14 +205,22 @@ markup=pango
 interval=2
 ```
 
-### Workspace Apps (task bar)
+### Task bar
 
 Add blocks that represent opened apps and create a task bar.
 
 ```
-[workspace_apps]
-command=/path/to/workspace_apps -x=$relative_x
+[workspace_apps_0]
+command=/path/to/workspace_apps 0 $BLOCK_BUTTON
 format=json
 markup=pango
 interval=1
+
+[workspace_apps_1]
+command=/path/to/workspace_apps 1 $BLOCK_BUTTON
+format=json
+markup=pango
+interval=1
+
+...
 ```

blocks/spotify/main.go

@@ -2,16 +2,10 @@ package main
 
 import (
 	"fmt"
-	sos"
-	"os/"
-	"strings"
-
-	r "gitnet.fr/deblan/i3-blocks-gsrrindg
-	r "gitnet.fr/deblan/i3-blocks-gsrrindg
-	r "gitnet.fr/deblan/i3-blocks-gsrrindg
-	r "gitnet.fr/deblan/i3-blocks-gsrrindg
-	r "gitnet.fr/deblan/i3-blocks-gsrrindg
 	r "gitnet.fr/deblan/i3-blocks-go/rendering"
+	"os"
+	"os/exec"
+	"strings"
 )
 
 func GetMetadata(metadata string) string {
@@ -26,15 +20,11 @@ func GetMetadata(metadata string) string {
 }
 
 func GetTitle() string {
-	data := GetMetadata("xesam:title")
-
-	return strings.Trim(string(data), "\n")
+	return GetMetadata("xesam:title")
 }
 
 func GetArtist() string {
-	data := GetMetadata("xesam:artist")
-
-	return strings.Trim(string(data), "\n")
+	return GetMetadata("xesam:artist")
 }
 
 func GetStatus() string {
@@ -51,8 +41,6 @@ func main() {
 
 	if status == "Not available" {
 		return
-	} else if status == "Stopped" {
-		return
 	} else if status == "Paused" {
 		stmt = r.TextWithPadding(r.FontAwesome("\uf04c"), r.FB{
 			Background: r.Color("black3"),

blocks/weather/main.go

@@ -1,58 +0,0 @@
-package main
-
-import (
-	"flag"
-	"fmt"
-	r "gitnet.fr/deblan/i3-blocks-go/rendering"
-	"io"
-	"net/http"
-	"os"
-	"os/exec"
-	"strings"
-	"sync"
-)
-
-func openBrowser(wg *sync.WaitGroup, url string) {
-	defer wg.Done()
-	command := exec.Command("tmux", "new", "-d", "xdg-open", url)
-	command.Run()
-}
-
-func main() {
-	var wg sync.WaitGroup
-
-	argLocation := flag.String("loc", "", "location")
-	argLang := flag.String("lang", "fr", "lang")
-	flag.Parse()
-
-	url := fmt.Sprintf("https://%s.wttr.in/%s?format=%%l+%%c+%%t+%%m", *argLang, *argLocation)
-
-	if os.Getenv("BLOCK_BUTTON") == "1" {
-		url2 := fmt.Sprintf("https://%s.wttr.in/%s", *argLang, *argLocation)
-		wg.Add(1)
-		go openBrowser(&wg, url2)
-	}
-
-	resp, err := http.Get(url)
-
-	if err != nil {
-		return
-	}
-
-	defer resp.Body.Close()
-	body, _ := io.ReadAll(resp.Body)
-	content := string(body)
-
-	fb := r.FB{
-		Foreground: r.Color("white1"),
-		Background: r.Color("black2"),
-	}
-
-	content = strings.ReplaceAll(content, "  ", " ")
-	options := r.NewBlockOptions()
-	options.FullText = r.TextWithPadding(content, fb)
-	block := r.Block("meteo", options)
-
-	fmt.Println(block)
-	wg.Wait()
-}

blocks/workspace_apps/main.go

@@ -4,8 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	r "gitnet.fr/deblan/i3-blocks-go/rendering"
-	// "os"
-	"flag"
+	"os"
 	"os/exec"
 	"strconv"
 	"strings"
@@ -118,55 +117,50 @@ func main() {
 	tree := GetTree()
 	nodes := GetVisibleNodes(tree, workspaces)
 
-	argX := flag.String("x", "", "")
-	flag.Parse()
+	appNumber, _ := strconv.Atoi(os.Args[1])
+	blockButton := ""
 
-	x := 0
-	minX := 0
-
-	if *argX != "" {
-		x, _ = strconv.Atoi(*argX)
+	for k, v := range os.Args {
+		if k == 2 {
+			blockButton = v
+		}
 	}
 
-	options := r.NewBlockOptions()
+	for key, app := range nodes {
+		if key == appNumber {
+			foreground := "#9cb7d1"
+			background := "#222222"
 
-	for _, app := range nodes {
-		foreground := "#9cb7d1"
-		background := "#222222"
+			if app.Urgent {
+				foreground = "#ffffff"
+				background = "#07c0d4"
+			} else if app.Focused {
+				foreground = "#07c0d4"
+				background = "#333333"
+			} else if app.Output == "__i3" {
+				foreground = "#bababa"
+			}
 
-		title := strings.ToUpper(app.WindowProperties.Title)
+			fb := r.FB{
+				Foreground: foreground,
+				Background: background,
+			}
 
-		if len(title) > 30 {
-			title = fmt.Sprintf("%s…", title[0:29])
+			title := strings.ToUpper(app.WindowProperties.Title)
+
+			if len(title) > 25 {
+				title = fmt.Sprintf("%s…", title[0:22])
+			}
+
+			options := r.NewBlockOptions()
+			options.FullText = r.TextWithPadding(title, fb)
+			block := r.Block(fmt.Sprintf("workspace_apps_%d", appNumber), options)
+
+			fmt.Println(block)
+
+			if blockButton == "1" {
+				Focus(app.Window)
+			}
 		}
-
-		size := (len(title) + 4) * 6
-		maxX := minX + size
-		isClicked := (x > minX && x < maxX)
-		minX = maxX
-
-		if app.Urgent {
-			foreground = "#ffffff"
-			background = "#07c0d4"
-		} else if (app.Focused && x == 0) || isClicked {
-			foreground = "#07c0d4"
-			background = "#333333"
-		} else if app.Output == "__i3" {
-			foreground = "#bababa"
-		}
-
-		if isClicked {
-			Focus(app.Window)
-		}
-
-		fb := r.FB{
-			Foreground: foreground,
-			Background: background,
-		}
-
-		options.FullText = fmt.Sprintf("%s%s", options.FullText, r.TextWithPadding(title, fb))
 	}
-
-	block := r.Block("workspace_apps", options)
-	fmt.Println(block)
 }

rendering/block.go

@@ -1,9 +1,7 @@
 package rendering
 
 import (
-	// "bytes"
 	"encoding/json"
-	// "strconv"
 	"strings"
 )
 
@@ -33,7 +31,6 @@ func Block(name string, options BlockOptions) string {
 
 	block = strings.ReplaceAll(block, `\u003c`, "<")
 	block = strings.ReplaceAll(block, `\u003e`, ">")
-	block = strings.ReplaceAll(block, `\u0026`, "et")
 
 	return block
 }