Added i3, swayfx and hyprland WM detection

config/fetch_script.sh

@@ -7,38 +7,38 @@ echo -e "${C3}Packages: ${C4}$(get_packages)"
 echo -e "${C3}Shell: ${C4}${USER_SHELL}"
 echo -e "${C3}Init: ${C4}${INIT_SYSTEM}"
 echo -e "${C3}Libc: ${C4}${LIBC}"
-if [ ! -z "$CPU_MODEL" ]; then echo -e "${C3}CPU: ${C4}${CPU_MODEL} (${CPU_THREADS} threads)"; fi
-for i in $(seq ${CONNECTED_GPUS}); do
+[ -n "$CPU_MODEL" ] && echo -e "${C3}CPU: ${C4}${CPU_MODEL} (${CPU_THREADS} threads)"
+for i in $(seq "${CONNECTED_GPUS}"); do
     gpu="GPU$i"
     echo -e "${C3}GPU: ${C4}${!gpu}"
   done
-if [ ! -z "$MEM_TOTAL" ] && [ ! -z "$MEM_USED" ]; then echo -e "${C3}Memory: ${C4}${MEM_USED} MiB / ${MEM_TOTAL} MiB"; fi
-for i in $(seq ${MOUNTED_PARTITIONS}); do
-    device="PARTITION${i}_DEVICE"
-    mountpoint="PARTITION${i}_MOUNTPOINT"
-    label="PARTITION${i}_LABEL"
-    type="PARTITION${i}_TYPE"
-    total="PARTITION${i}_TOTAL_SIZE"
-    used="PARTITION${i}_USED_SIZE"
-    if [ -z "${!type}" ]; then
-      if [ -z "${!label}" ]; then
-        echo -e "${C3}Partition ${!mountpoint}: ${C4}${!used}/${!total}"
-      else
-        echo -e "${C3}Partition ${!label}: ${C4}${!used}/${!total}"
-      fi
+[ -n "$MEM_TOTAL" ] && [ -n "$MEM_USED" ] && echo -e "${C3}Memory: ${C4}${MEM_USED} MiB / ${MEM_TOTAL} MiB"
+for i in $(seq "${MOUNTED_PARTITIONS}"); do
+  mountpoint="PARTITION${i}_MOUNTPOINT"
+  label="PARTITION${i}_LABEL"
+  type="PARTITION${i}_TYPE"
+  total="PARTITION${i}_TOTAL_SIZE"
+  used="PARTITION${i}_USED_SIZE"
+  if [ -z "${!type}" ]; then
+    if [ -z "${!label}" ]; then
+      echo -e "${C3}Partition ${!mountpoint}: ${C4}${!used}/${!total}"
     else
-      if [ -z "${!label}" ]; then
-              echo -e "${C3}Partition ${!mountpoint} (${!type}): ${C4}${!used}/${!total}"
-            else
-              echo -e "${C3}Partition ${!label} (${!type}): ${C4}${!used}/${!total}"
-            fi
+      echo -e "${C3}Partition ${!label}: ${C4}${!used}/${!total}"
     fi
-  done
-if [ ! -z "$DISPLAY_PROTOCOL" ]; then
+  else
+    if [ -z "${!label}" ]; then
+      echo -e "${C3}Partition ${!mountpoint} (${!type}): ${C4}${!used}/${!total}"
+    else
+      echo -e "${C3}Partition ${!label} (${!type}): ${C4}${!used}/${!total}"
+    fi
+  fi
+done
+[ -n "$LOCAL_IPV4" ] && echo -e "${C3}Local IPv4 Address: ${C4}${LOCAL_IPV4}"
+if [ -n "$DISPLAY_PROTOCOL" ]; then
   echo -e "${C3}Display Protocol: ${C4}${DISPLAY_PROTOCOL}"
-  for i in $(seq ${CONNECTED_MONITORS}); do
+  for i in $(seq "${CONNECTED_MONITORS}"); do
     monitor="MONITOR$i"
     echo -e "${C3}Screen $i: ${C4}${!monitor}"
   done
 fi
-if [ ! -z "$DE_WM" ]; then echo -e "${C3}DE/WM: ${C4}${DE_WM}"; fi
+[ -n "$DE_WM" ] && echo -e "${C3}DE/WM: ${C4}${DE_WM}"

go.mod

@@ -10,6 +10,7 @@ require (
 )
 
 require (
+	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/jackmordaunt/pcidb v1.0.1 // indirect
 	github.com/jackmordaunt/wmi v1.2.4 // indirect

go.sum

@@ -1,5 +1,7 @@
 github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc h1:7D+Bh06CRPCJO3gr2F7h1sriovOZ8BMhca2Rg85c2nk=
 github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a h1:vxnBhFDDT+xzxf1jTJKMKZw3H0swfWk9RpWbBbDK5+0=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/jackmordaunt/ghw v1.0.4 h1:as+COFuPuXaNQC3WqzoHS/E2JYWZU7gN8ompNTUxNxs=

main.go

@@ -167,6 +167,7 @@ func SetupFetchEnv(showTimeTaken bool) []string {
 	setVariable("DISPLAY_PROTOCOL", func() string { return GetDisplayProtocol() })
 	setVariable("LIBC", func() string { return GetLibc() })
 	setVariable("INIT_SYSTEM", func() string { return GetInitSystem() })
+	setVariable("LOCAL_IPV4", func() string { return GetLocalIP() })
 	start = time.Now().UnixMilli()
 	monitors := getMonitorResolution()
 	end = time.Now().UnixMilli()

utils.go

@@ -3,13 +3,13 @@ package main
 import (
 	"bufio"
 	"fmt"
-	"github.com/BurntSushi/xgb"
-	"github.com/BurntSushi/xgb/xinerama"
+	"github.com/go-gl/glfw/v3.3/glfw"
 	"github.com/jackmordaunt/ghw"
 	"github.com/mitchellh/go-ps"
 	"github.com/moby/sys/mountinfo"
 	"log"
 	"math"
+	"net"
 	"os"
 	"os/exec"
 	"path"
@@ -272,10 +272,18 @@ func GetDEWM() string {
 		return "MATE " + runCommand("mate-about --version | awk '{print $4}'")
 	} else if processExists("lxsession") {
 		return "LXDE"
+	} else if processExists("i3") {
+		return "i3 " + runCommand("i3 --version | awk '{print $3}'")
 	} else if processExists("sway") {
-		return "Sway " + runCommand("sway --version | awk '{print $3}'")
+		if runCommand("sway --version | awk '{print $1}'") == "swayfx" {
+			return "SwayFX " + runCommand("sway --version | awk '{print $3}'")
+		} else {
+			return "Sway " + runCommand("sway --version | awk '{print $3}'")
+		}
 	} else if processExists("bspwm") {
 		return "Bspwm " + runCommand("bspwm -v")
+	} else if processExists("Hyprland") {
+		return "Hyprland " + runCommand("hyprctl version | sed -n 3p | awk '{print $2}' | tr -d 'v,'")
 	} else if processExists("icewm-session") {
 		return "IceWM " + runCommand("icewm --version | awk '{print $2}'")
 	}
@@ -294,20 +302,16 @@ func GetDisplayProtocol() string {
 
 func getMonitorResolution() []string {
 	var monitors []string
-	if GetDisplayProtocol() == "X11" {
-		conn, err := xgb.NewConn()
+	if GetDisplayProtocol() != "" {
+		err := glfw.Init()
 		if err != nil {
-			return nil
+			panic(err)
 		}
-		err = xinerama.Init(conn)
-		if err != nil {
-			return nil
-		}
-		reply, _ := xinerama.QueryScreens(conn).Reply()
-		conn.Close()
-		for _, screen := range reply.ScreenInfo {
-			monitors = append(monitors, strconv.Itoa(int(screen.Width))+"x"+strconv.Itoa(int(screen.Height)))
+		for _, monitor := range glfw.GetMonitors() {
+			mode := monitor.GetVideoMode()
+			monitors = append(monitors, fmt.Sprintf("%dx%d %dHz", mode.Width, mode.Height, mode.RefreshRate))
 		}
+		defer glfw.Terminate()
 	}
 	return monitors
 }
@@ -440,6 +444,18 @@ func GetLibc() string {
 	return "Musl " + strings.TrimSpace(string(bytes))
 }
 
+func GetLocalIP() string {
+	conn, err := net.Dial("udp", "8.8.8.8:80")
+	if err != nil {
+		return ""
+	}
+	defer conn.Close()
+
+	localAddr := conn.LocalAddr().(*net.UDPAddr)
+
+	return localAddr.IP.String()
+}
+
 func FormatBytes(bytes uint64) string {
 	var suffixes [6]string
 	suffixes[0] = "B"