Simplify color map system

.gitignore

@@ -1,4 +0,0 @@
-.idea
-build
-stormfetch
-stormfetch.tar.gz

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 CapCreeperGR
+Copyright (c) 2024 EnumDev
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,3 +1,5 @@
+SHELL := /bin/bash
+
 ifeq ($(PREFIX),)
     PREFIX := /usr/local
 endif
@@ -8,12 +10,12 @@ ifeq ($(SYSCONFDIR),)
     SYSCONFDIR := $(PREFIX)/etc
 endif
 ifeq ($(GO),)
-    GO := /usr/bin/go
+    GO := $(shell type -a -P go | head -n 1)
 endif
 
 build:
 	mkdir -p build
-	$(GO) build -ldflags "-w" -o build/stormfetch stormfetch
+	cd src; $(GO) build -ldflags "-w -X 'main.systemConfigDir=$(SYSCONFDIR)'" -o ../build/stormfetch stormfetch
 
 install: build/stormfetch config/
 	mkdir -p $(DESTDIR)$(BINDIR)
@@ -21,16 +23,10 @@ install: build/stormfetch config/
 	cp build/stormfetch $(DESTDIR)$(BINDIR)/stormfetch
 	cp -r config/. $(DESTDIR)$(SYSCONFDIR)/stormfetch/
 
-compress: build/stormfetch config/
-	mkdir -p stormfetch/$(BINDIR)
-	mkdir -p stormfetch/$(SYSCONFDIR)/stormfetch/
-	cp build/stormfetch stormfetch/$(BINDIR)/stormfetch
-	cp -r config/. stormfetch/$(SYSCONFDIR)/stormfetch/
-	tar --owner=root --group=root -czf stormfetch.tar.gz stormfetch
-	rm -r stormfetch
-
 run: build/stormfetch
 	build/stormfetch
 
 clean:
 	rm -r build/
+
+.PHONY: build

README.md

@@ -2,9 +2,6 @@
 # Stormfetch
 ## A simple linux fetch program written in go and bash
 
-### Developers:
-- [CapCreeperGR ](https://gitlab.com/CapCreeperGR)
-
 ### Project Information
 Stormfetch is a program that can read your system's information and display it in the terminal along with the ASCII art of the Linux distribution you are running.
 Stormfetch is still in beta, so distro compatibility is limited. If you would like to contribute ASCII art or add other compatibility features feel free to create a pull request or notify me through GitLab Issues.
@@ -20,7 +17,7 @@ Stormfetch is still in beta, so distro compatibility is limited. If you would li
 - Download `make` from your package manager
 - Run the following command to compile the project
 ```
-make
+make SYSCONFDIR=/etc
 ```
 - Run the following command to install stormfetch into your system. You may also append a DESTDIR variable at the end of this line if you wish to install in a different location
 ```

config/ascii/artix

@@ -0,0 +1,20 @@
+#/45;27;45;7
+${C1}                  'o'
+                 'ooo'
+                'ooxoo'
+               'ooxxxoo'
+              'oookkxxoo'
+             'oiioxkkxxoo'
+            ':;:iiiioxxxoo'
+               `'.;::ioxxoo'
+          '-.      `':;jiooo'
+         'oooio-..     `'i:io'
+        'ooooxxxxoio:,.   `'-;'
+       'ooooxxxxxkkxoooIi:-.  `'
+      'ooooxxxxxkkkkxoiiiiiji'
+     'ooooxxxxxkxxoiiii:'`     .i'
+    'ooooxxxxxoi:::'`       .;ioxo'
+   'ooooxooi::'`         .:iiixkxxo'
+  'ooooi:'`                `'';ioxxo'
+ 'i:'`                          '':io'
+'`                                   `'

config/ascii/bedrock

@@ -0,0 +1,12 @@
+#/7;8;8;7
+${C1}   \\\\\\\\\\\\
+    \\\      \\\
+     \\\      \\\
+      \\\      \\\\\\\\\\\\\\\\\
+       \\\                    \\\
+        \\\                    \\\
+         \\\        ${C2}______      \\\
+          \\\                   ///
+           \\\                 ///
+            \\\               ///
+             \\\////////////////

config/ascii/cachyos

@@ -0,0 +1,23 @@
+#/43;45;45;15
+           ${C3}.${C1}-------------------------:
+          .${C2}+=${C1}========================.
+         :${C2}++${C1}===${C2}++===${C1}===============-       :${C2}++${C1}-
+        :${C2}*++${C1}====${C2}+++++==${C1}===========-        .==:
+       -${C2}*+++${C1}=====${C2}+***++=${C1}=========:
+      =${C2}*++++=${C1}=======------------:
+     =${C2}*+++++=${C1}====-                     ${C3}...${C1}
+   .${C2}+*+++++${C1}=-===:                    .${C2}=+++=${C1}:
+  :${C2}++++${C1}=====-==:                     -***${C2}**${C1}+
+ :${C2}++=${C1}=======-=.                      .=+**+${C3}.${C1}
+.${C2}+${C1}==========-.                          ${C3}.${C1}
+ :${C2}+++++++${C1}====-                                ${C3}.${C1}--==-${C3}.${C1}
+  :${C2}++${C1}==========.                             ${C3}:${C2}+++++++${C1}${C3}:
+   ${C1}.-===========.                            =*****+*+
+    ${C1}.-===========:                           .+*****+:
+      ${C1}-=======${C2}++++${C1}:::::::::::::::::::::::::-:  ${C3}.${C1}---:
+       :======${C2}++++${C1}====${C2}+++******************=.
+        ${C1}:=====${C2}+++${C1}==========${C2}++++++++++++++*-
+         ${C1}.====${C2}++${C1}==============${C2}++++++++++*-
+          ${C1}.===${C2}+${C1}==================${C2}+++++++:
+           ${C1}.-=======================${C2}+++:
+             ${C3}..........................

config/ascii/linuxmint

@@ -0,0 +1,20 @@
+#/34;15;46;252
+${C2}             ...-:::::-...
+${C2}          .-MMMMMMMMMMMMMMM-.
+      .-MMMM${C1}`..-:::::::-..`${C2}MMMM-.
+    .:MMMM${C1}.:MMMMMMMMMMMMMMM:.${C2}MMMM:.
+   -MMM${C1}-M---MMMMMMMMMMMMMMMMMMM.${C2}MMM-
+ `:MMM${C1}:MM`  :MMMM:....::-...-MMMM:${C2}MMM:`
+ :MMM${C1}:MMM`  :MM:`  ``    ``  `:MMM:${C2}MMM:
+.MMM${C1}.MMMM`  :MM.  -MM.  .MM-  `MMMM.${C2}MMM.
+:MMM${C1}:MMMM`  :MM.  -MM-  .MM:  `MMMM-${C2}MMM:
+:MMM${C1}:MMMM`  :MM.  -MM-  .MM:  `MMMM:${C2}MMM:
+:MMM${C1}:MMMM`  :MM.  -MM-  .MM:  `MMMM-${C2}MMM:
+.MMM${C1}.MMMM`  :MM:--:MM:--:MM:  `MMMM.${C2}MMM.
+ :MMM${C1}:MMM-  `-MMMMMMMMMMMM-`  -MMM-${C2}MMM:
+  :MMM${C1}:MMM:`                `:MMM:${C2}MMM:
+   .MMM${C1}.MMMM:--------------:MMMM.${C2}MMM.
+     '-MMMM${C1}.-MMMMMMMMMMMMMMM-.${C2}MMMM-'
+       '.-MMMM${C1}``--:::::--``${C2}MMMM-.'
+${C2}            '-MMMMMMMMMMMMM-'
+${C2}               ``-:::::-``

config/ascii/pop

@@ -0,0 +1,21 @@
+#/33;7;11;15
+${C1}             /////////////
+         /////////////////////
+      ///////${C2}*767${C1}////////////////
+    //////${C2}7676767676*${C1}//////////////
+   /////${C2}76767${C1}//${C2}7676767${C1}//////////////
+  /////${C2}767676${C1}///${C2}*76767${C1}///////////////
+ ///////${C2}767676${C1}///${C2}76767${C1}.///${C2}7676*${C1}///////
+/////////${C2}767676${C1}//${C2}76767${C1}///${C2}767676${C1}////////
+//////////${C2}76767676767${C1}////${C2}76767${C1}/////////
+///////////${C2}76767676${C1}//////${C2}7676${C1}//////////
+////////////,${C2}7676${C1},///////${C2}767${C1}///////////
+/////////////*${C2}7676${C1}///////${C2}76${C1}////////////
+///////////////${C2}7676${C1}////////////////////
+ ///////////////${C2}7676${C1}///${C2}767${C1}////////////
+  //////////////////////${C2}'${C1}////////////
+   //////${C2}.7676767676767676767,${C1}//////
+    /////${C2}767676767676767676767${C1}/////
+      ///////////////////////////
+         /////////////////////
+             /////////////

config/ascii/tide

@@ -1,18 +1,15 @@
-#/6;10;5;12
+#/27;39;5;12
-${C1}                 @@@@@@@@@
+            ${C1}@@@@               ${C1}@@@${C2}*
-              @@@~~~~~~~~~@@
+          ${C1}@@${C2}~~~~${C1}@@           ${C1}@@${C2}~~~
-            @@~~~         ~~@
+        ${C1}@@${C2}~~    ${C2}~~${C1}@        ${C1}@@${C2}~~
-           @~~              @
+      ${C1}@@${C2}~~        ${C2}~${C1}@    ${C1}@@@${C2}~~
-          @~          @@@  @
+   ${C2}*${C1}@@${C2}~~   ${C1}@@@@    ${C2}~${C1}@@@@${C2}~~~   ${C1}@@@${C2}*
-        @@~          @   @@
+    ${C2}~~   ${C1}@@${C2}~~~~${C1}@@   ${C2}~~~~    ${C1}@@${C2}~~~
-      @@~~           @
+       ${C1}@@${C2}~~    ${C2}~~${C1}@        ${C1}@@${C2}~~
-   @@@~~             ~@@           @@@
+     ${C1}@@${C2}~~        ${C2}~${C1}@    ${C1}@@@${C2}~~
-   ~~~                ~~@@@    @@@@~~~
+  ${C2}*${C1}@@${C2}~~   ${C1}@@@@    ${C2}~${C1}@@@@${C2}~~~   ${C1}@@@${C2}*
-                        ~~~@@@@~~~~
+   ${C2}~~   ${C1}@@${C2}~~~~${C1}@@   ${C2}~~~~    ${C1}@@${C2}~~~
-   @@@@          @@@@@@@   ~~~~   @@@@
+      ${C1}@@${C2}~~    ${C2}~~${C1}@        ${C1}@@${C2}~~
-   ~~~~@@@@    @@~~~~~~~@@    @@@@
+    ${C1}@@${C2}~~        ${C2}~${C1}@    ${C1}@@@${C2}~~
-       ~~~~@@@@~~       ~~@@@@~~~~
+ ${C2}*${C1}@@${C2}~~           ${C2}~${C1}@@@@${C2}~~~
-    @@@    ~~~~   @@@@@   ~~~~    @@@
+  ${C2}~~              ${C2}~~~~
-    ~~~@@@@   @@@@~~~~~@@@@   @@@@~~~
-       ~~~~@@@~~~~     ~~~~@@@~~~
-           ~~~             ~~~

config/ascii/ubuntu

@@ -1,6 +1,6 @@
 #/1;7;3;15
 ${C1}            .-/+oossssoo+\-.
-        ´:+ssssssssssssssssss+:`
+        ':+ssssssssssssssssss+:'
       -+ssssssssssssssssssyyssss+-
     .ossssssssssssssssss${C2}dMMMNy${C1}sssso.
    /sssssssssss${C2}hdmmNNmmyNMMMMh${C1}ssssss\
@@ -17,5 +17,5 @@ oss${C2}yNMMMNyMMh${C1}sssssssssssssshmmmh${C1}ssssssso
    \sssssssssss${C2}hdmNNNNmyNMMMMh${C1}ssssss/
     .ossssssssssssssssss${C2}dMMMNy${C1}sssso.
       -+sssssssssssssssss${C2}yyy${C1}ssss+-
-        `:+ssssssssssssssssss+:`
+        ':+ssssssssssssssssss+:'
             .-\+oossssoo+/-.

config/ascii/void

@@ -0,0 +1,19 @@
+#/2;36;72;15
+          ${C2}:::::----:::::
+       ${C2}::----------------::=
+        ${C2}:-------------------::
+${C1}   :      ${C2}:::.      ..:-------:
+${C1}  =*=.                  ${C2}.:-----:
+${C1} =****-                   ${C2}:-----:
+${C1}=*****-       ${C2}::::::       :-----:
+${C1}=****+      ${C2}:--------:      :----:
+${C1}+****-     ${C2}.----------.     :----:
+${C1}+****-     ${C2}.----------.     :-----
+${C1}=****+      ${C2}:--------:      :----:
+${C1}=*****-       ${C2}::::::       :-----:
+${C1} =*****-                   ${C2}:----:
+${C1}  =*****+:                   ${C2}:-:
+${C1}   =*******=::      ::=-.     ${C2}.
+${C1}    ==*******************-
+${C1}      ===****************=-
+${C1}          ===+=****++===

config/config.yaml

@@ -1,5 +1,7 @@
 distro_ascii: auto
 fetch_script: auto
-ansii_colors: []
+show_fs_type: true
-force_config_ansii: false
+hidden_partitions: []
-dependency_warning: true
+# Hiding squashfs prevents snaps from showing up
+hidden_filesystems: ["squashfs"]
+hidden_gpus: []

config/fetch_script.sh

@@ -1,30 +1,46 @@
-source fetch_script_functions.sh
-
 echo -e "${C3}Distribution: ${C4}${DISTRO_LONG_NAME} ($(uname -m))"
 echo -e "${C3}Hostname: ${C4}$(cat /etc/hostname)"
 echo -e "${C3}Kernel: ${C4}$(uname -s) $(uname -r)"
-echo -e "${C3}Packages: ${C4}$(get_packages)"
+echo -e "${C3}Packages: ${C4}${PACKAGES}"
 echo -e "${C3}Shell: ${C4}${USER_SHELL}"
-if [ ! -z "$CPU_MODEL" ]; then echo -e "${C3}CPU: ${C4}${CPU_MODEL} (${CPU_THREADS} threads)"; fi
+echo -e "${C3}Init: ${C4}${INIT_SYSTEM}"
-if [ ! -z "$GPU_MODEL" ]; then echo -e "${C3}GPU: ${C4}${GPU_MODEL}"; fi
+echo -e "${C3}Libc: ${C4}${LIBC}"
-if [ ! -z "$MEM_TOTAL" ] && [ ! -z "$MEM_USED" ]; then echo -e "${C3}Memory: ${C4}${MEM_USED} MiB / ${MEM_TOTAL} MiB"; fi
+[ -n "$MOTHERBOARD" ] && echo -e "${C3}Motherboard: ${C4}${MOTHERBOARD}"
-for i in $(seq ${MOUNTED_PARTITIONS}); do
+[ -n "$CPU_MODEL" ] && echo -e "${C3}CPU: ${C4}${CPU_MODEL} (${CPU_THREADS} threads)"
-    device="PARTITION${i}_DEVICE"
+for i in $(seq "${CONNECTED_GPUS}"); do
-    mountpoint="PARTITION${i}_MOUNTPOINT"
+    gpu="GPU$i"
-    label="PARTITION${i}_LABEL"
+    echo -e "${C3}GPU: ${C4}${!gpu}"
-    total="PARTITION${i}_TOTAL_SIZE"
+  done
-    used="PARTITION${i}_USED_SIZE"
+[ -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
       echo -e "${C3}Partition ${!label}: ${C4}${!used}/${!total}"
     fi
-  done
+  else
-if [ ! -z "$DISPLAY_PROTOCOL" ]; then
+    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}"
+
+# Exiting with error code 0 in case the condition above returns 1
+exit 0

config/fetch_script_functions.sh

@@ -1,37 +0,0 @@
-command_exists() {
-    if [ -z "$1" ]; then
-        return 1
-    fi
-    if command -v "$1" &> /dev/null; then
-        return 0
-    else
-        return 1
-    fi
-}
-
-get_packages() {
-    ARRAY=()
-    if command_exists dpkg; then
-        ARRAY+=("$(dpkg-query -f '.\n' -W | wc -l) (dpkg)")
-    fi
-    if command_exists pacman; then
-        ARRAY+=("$(pacman -Q | wc -l) (pacman)")
-    fi
-    if command_exists rpm; then
-        ARRAY+=("$(rpm -qa | wc -l) (rpm)")
-    fi
-    if command_exists bpm; then
-        ARRAY+=("$(bpm list -n) (bpm)")
-    fi
-    if command_exists emerge; then
-        ARRAY+=("$(ls -l /var/db/pkg/ | wc -l) (emerge)")
-    fi
-    if command_exists flatpak; then
-        ARRAY+=("$(flatpak list | wc -l) (flatpak)")
-    fi
-    if command_exists snap; then
-        ARRAY+=("$(snap list | wc -l) (snap)")
-    fi
-    echo "${ARRAY[@]}"
-    unset ARRAY
-}

main.go

@@ -1,225 +0,0 @@
-package main
-
-import (
-	"fmt"
-	yaml "gopkg.in/yaml.v3"
-	"log"
-	"os"
-	"os/exec"
-	"path"
-	"regexp"
-	"strconv"
-	"strings"
-)
-
-var configPath = ""
-var fetchScriptPath = ""
-
-var config = StormfetchConfig{
-	Ascii:             "auto",
-	FetchScript:       "auto",
-	AnsiiColors:       make([]int, 0),
-	ForceConfigAnsii:  false,
-	DependencyWarning: true,
-}
-
-type StormfetchConfig struct {
-	Ascii             string `yaml:"distro_ascii"`
-	FetchScript       string `yaml:"fetch_script"`
-	AnsiiColors       []int  `yaml:"ansii_colors"`
-	ForceConfigAnsii  bool   `yaml:"force_config_ansii"`
-	DependencyWarning bool   `yaml:"dependency_warning"`
-}
-
-func main() {
-	readConfig()
-}
-
-func readConfig() {
-	// Get home directory
-	configDir, _ := os.UserConfigDir()
-	// Find valid config directory
-	if _, err := os.Stat(path.Join(configDir, "stormfetch/config.yaml")); err == nil {
-		configPath = path.Join(configDir, "stormfetch/config.yaml")
-	} else if _, err := os.Stat("/etc/stormfetch/config.yaml"); err == nil {
-		configPath = "/etc/stormfetch/config.yaml"
-	} else {
-		log.Fatalf("Config file not found: %s", err.Error())
-	}
-	// Parse config
-	bytes, err := os.ReadFile(configPath)
-	if err != nil {
-		log.Fatal(err)
-	}
-	err = yaml.Unmarshal(bytes, &config)
-	if err != nil {
-		log.Fatal(err)
-	}
-	if config.FetchScript == "" {
-		log.Fatalf("Fetch script path is empty")
-	} else if config.FetchScript != "auto" {
-		stat, err := os.Stat(config.FetchScript)
-		if err != nil {
-			log.Fatalf("Fetch script file not found: %s", err.Error())
-		} else if stat.IsDir() {
-			log.Fatalf("Fetch script path points to a directory")
-		}
-	}
-	if _, err := os.Stat(path.Join(configDir, "stormfetch/fetch_script.sh")); err == nil {
-		fetchScriptPath = path.Join(configDir, "stormfetch/fetch_script.sh")
-	} else if _, err := os.Stat("/etc/stormfetch/fetch_script.sh"); err == nil {
-		fetchScriptPath = "/etc/stormfetch/fetch_script.sh"
-	} else {
-		log.Fatalf("Fetch script file not found: %s", err.Error())
-	}
-	// Show Dependency warning if enabled
-	if config.DependencyWarning {
-		var dependencies []string
-		var missing []string
-		for _, depend := range dependencies {
-			if _, err := os.Stat(path.Join("/usr/bin/", depend)); err != nil {
-				missing = append(missing, depend)
-			}
-		}
-		if len(missing) != 0 {
-			fmt.Println("[WARNING] Stormfetch functionality may be limited due to the following dependencies not being installed:")
-			for _, depend := range missing {
-				fmt.Println(depend)
-			}
-			fmt.Println("You can disable this warning through your stormfetch config")
-		}
-	}
-	// Fetch ascii art and apply colors
-	colorMap := make(map[string]string)
-	colorMap["C0"] = "\033[0m"
-	setColorMap := func() {
-		for i := 0; i < 6; i++ {
-			if i > len(config.AnsiiColors)-1 {
-				colorMap["C"+strconv.Itoa(i+1)] = "\033[0m"
-				continue
-			}
-			colorMap["C"+strconv.Itoa(i+1)] = fmt.Sprintf("\033[1m\033[38;5;%dm", config.AnsiiColors[i])
-		}
-	}
-	setColorMap()
-	ascii := getDistroAsciiArt()
-	if strings.HasPrefix(ascii, "#/") {
-		firstLine := strings.Split(ascii, "\n")[0]
-		if !config.ForceConfigAnsii {
-			ansiiColors := strings.Split(strings.TrimPrefix(firstLine, "#/"), ";")
-			for i, color := range ansiiColors {
-				atoi, err := strconv.Atoi(color)
-				if err != nil {
-					log.Fatal(err)
-				}
-				if i < len(config.AnsiiColors) {
-					config.AnsiiColors[i] = atoi
-				} else {
-					config.AnsiiColors = append(config.AnsiiColors, atoi)
-				}
-			}
-			setColorMap()
-		}
-		ascii = os.Expand(ascii, func(s string) string {
-			return colorMap[s]
-		})
-		ascii = strings.TrimPrefix(ascii, firstLine+"\n")
-	} else {
-		ascii = os.Expand(ascii, func(s string) string {
-			return colorMap[s]
-		})
-	}
-	asciiSplit := strings.Split(ascii, "\n")
-	asciiNoColor := StripAnsii(ascii)
-	//Execute fetch script
-	cmd := exec.Command("/bin/bash", fetchScriptPath)
-	cmd.Dir = path.Dir(fetchScriptPath)
-	cmd.Env = os.Environ()
-	cmd.Env = append(cmd.Env, SetupFetchEnv()...)
-	cmd.Env = append(cmd.Env, "C0=\033[0m")
-	for key, value := range colorMap {
-		cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", key, value))
-	}
-	out, err := cmd.Output()
-	if err != nil {
-		log.Fatal(err)
-	}
-	// Print Distro Information
-	maxWidth := 0
-	for _, line := range strings.Split(asciiNoColor, "\n") {
-		if len(line) > maxWidth {
-			maxWidth = len(line)
-		}
-	}
-	final := ""
-	for lineIndex, line := range asciiSplit {
-		lineVisibleLength := len(strings.Split(asciiNoColor, "\n")[lineIndex])
-		lastAsciiColor := ""
-		if lineIndex != 0 {
-			r := regexp.MustCompile("\033[38;5;[0-9]+m")
-			matches := r.FindAllString(asciiSplit[lineIndex-1], -1)
-			if len(matches) != 0 {
-				lastAsciiColor = r.FindAllString(asciiSplit[lineIndex-1], -1)[len(matches)-1]
-			}
-		}
-		for i := lineVisibleLength; i < maxWidth+5; i++ {
-			line = line + " "
-		}
-		asciiSplit[lineIndex] = lastAsciiColor + line
-		str := string(out)
-		if lineIndex < len(strings.Split(str, "\n")) {
-			line = line + colorMap["C0"] + strings.Split(str, "\n")[lineIndex]
-		}
-		final += lastAsciiColor + line + "\n"
-	}
-	fmt.Println(final)
-}
-
-func SetupFetchEnv() []string {
-	var env = make(map[string]string)
-	env["DISTRO_LONG_NAME"] = getDistroInfo().LongName
-	env["DISTRO_SHORT_NAME"] = getDistroInfo().ShortName
-	env["CPU_MODEL"] = getCPUName()
-	env["CPU_THREADS"] = strconv.Itoa(getCPUThreads())
-	memory := GetMemoryInfo()
-	if memory != nil {
-		env["MEM_TOTAL"] = strconv.Itoa(memory.MemTotal)
-		env["MEM_USED"] = strconv.Itoa(memory.MemTotal - memory.MemAvailable)
-		env["MEM_FREE"] = strconv.Itoa(memory.MemAvailable)
-	}
-	partitions := getMountedPartitions()
-	if len(partitions) != 0 {
-		env["MOUNTED_PARTITIONS"] = strconv.Itoa(len(partitions))
-		for i, part := range partitions {
-			env["PARTITION"+strconv.Itoa(i+1)+"_DEVICE"] = part.Device
-			env["PARTITION"+strconv.Itoa(i+1)+"_MOUNTPOINT"] = part.MountPoint
-			if part.Label != "" {
-				env["PARTITION"+strconv.Itoa(i+1)+"_LABEL"] = part.Label
-			}
-			env["PARTITION"+strconv.Itoa(i+1)+"_TOTAL_SIZE"] = FormatBytes(part.TotalSize)
-			env["PARTITION"+strconv.Itoa(i+1)+"_USED_SIZE"] = FormatBytes(part.UsedSize)
-			env["PARTITION"+strconv.Itoa(i+1)+"_FREE_SIZE"] = FormatBytes(part.FreeSize)
-		}
-	}
-	env["DE_WM"] = GetDEWM()
-	env["USER_SHELL"] = GetShell()
-	env["DISPLAY_PROTOCOL"] = GetDisplayProtocol()
-	monitors := getMonitorResolution()
-	if len(monitors) != 0 {
-		env["CONNECTED_MONITORS"] = strconv.Itoa(len(monitors))
-		for i, monitor := range monitors {
-			env["MONITOR"+strconv.Itoa(i+1)] = monitor
-		}
-	}
-	if getGPUName() != "" {
-		env["GPU_MODEL"] = getGPUName()
-	}
-
-	var ret = make([]string, len(env))
-	i := 0
-	for key, value := range env {
-		ret[i] = fmt.Sprintf("%s=%s", key, value)
-		i++
-	}
-	return ret
-}

src/color.go

@@ -0,0 +1,23 @@
+package main
+
+import (
+	"fmt"
+	"strconv"
+	"strings"
+)
+
+func setupColorMap(asciiArt string) map[string]string {
+	colorMap := make(map[string]string)
+
+	// Read colors from ascii art
+	if strings.HasPrefix(asciiArt, "#/") {
+		firstLine := strings.Split(asciiArt, "\n")[0]
+		ansiColors := strings.Split(strings.TrimPrefix(firstLine, "#/"), ";")
+
+		for i, ansiColor := range ansiColors {
+			colorMap["C"+strconv.Itoa(i+1)] = fmt.Sprintf("\033[38;5;%sm", ansiColor)
+		}
+	}
+
+	return colorMap
+}

src/go.mod

@@ -3,7 +3,7 @@ module stormfetch
 go 1.22
 
 require (
-	github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc
+	github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a
 	github.com/jackmordaunt/ghw v1.0.4
 	github.com/mitchellh/go-ps v1.0.0
 	gopkg.in/yaml.v3 v3.0.1

src/go.sum

@@ -1,5 +1,5 @@
-github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc h1:7D+Bh06CRPCJO3gr2F7h1sriovOZ8BMhca2Rg85c2nk=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a h1:vxnBhFDDT+xzxf1jTJKMKZw3H0swfWk9RpWbBbDK5+0=
-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/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=

src/hardware.go

@@ -0,0 +1,75 @@
+package main
+
+import (
+	"fmt"
+	"github.com/go-gl/glfw/v3.3/glfw"
+	"github.com/jackmordaunt/ghw"
+	"os"
+	"os/exec"
+	"slices"
+	"strings"
+)
+
+func GetCPUModel() string {
+	cpu, err := ghw.CPU()
+	if err != nil {
+		return ""
+	}
+	if len(cpu.Processors) == 0 {
+		return ""
+	}
+	return cpu.Processors[0].Model
+}
+
+func GetCPUThreads() int {
+	cpu, err := ghw.CPU()
+	if err != nil {
+		return 0
+	}
+	return int(cpu.TotalThreads)
+}
+
+func GetGPUModels() (ret []string) {
+	cmd := exec.Command("sh", "-c", "lspci -v -m | grep 'VGA' -A6 | grep '^Device:'")
+	bytes, err := cmd.Output()
+	if err != nil {
+		return nil
+	}
+
+	for i, gpu := range strings.Split(string(bytes), "\n") {
+		if slices.Contains(config.HiddenGPUS, i+1) {
+			continue
+		}
+		if gpu == "" {
+			continue
+		}
+		gpu = strings.TrimPrefix(strings.TrimSpace(gpu), "Device:\t")
+		ret = append(ret, gpu)
+	}
+
+	return ret
+}
+
+func GetMotherboardModel() string {
+	bytes, err := os.ReadFile("/sys/devices/virtual/dmi/id/board_name")
+	if err != nil {
+		return ""
+	}
+	return strings.TrimSpace(string(bytes))
+}
+
+func GetMonitorResolution() []string {
+	var monitors []string
+	if GetDisplayProtocol() != "" {
+		err := glfw.Init()
+		if err != nil {
+			panic(err)
+		}
+		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
+}

src/main.go

@@ -0,0 +1,260 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"log"
+	"os"
+	"os/exec"
+	"path"
+	"regexp"
+	"strconv"
+	"strings"
+	"time"
+
+	"gopkg.in/yaml.v3"
+)
+
+var systemConfigDir = "/etc/"
+
+var configPath = ""
+var fetchScriptPath = ""
+
+var TimeTaken = false
+
+var config = StormfetchConfig{
+	Ascii:            "auto",
+	FetchScript:      "auto",
+	ShowFSType:       false,
+	HiddenPartitions: make([]string, 0),
+	HiddenGPUS:       make([]int, 0),
+}
+
+type StormfetchConfig struct {
+	Ascii             string   `yaml:"distro_ascii"`
+	DistroName        string   `yaml:"distro_name"`
+	FetchScript       string   `yaml:"fetch_script"`
+	AnsiiColors       []int    `yaml:"ansii_colors"`
+	ForceConfigAnsii  bool     `yaml:"force_config_ansii"`
+	ShowFSType        bool     `yaml:"show_fs_type"`
+	HiddenPartitions  []string `yaml:"hidden_partitions"`
+	HiddenFilesystems []string `yaml:"hidden_filesystems"`
+	HiddenGPUS        []int    `yaml:"hidden_gpus"`
+}
+
+func main() {
+	readConfig()
+	readFlags()
+	runStormfetch()
+}
+
+func readConfig() {
+	// Get home directory
+	userConfigDir, _ := os.UserConfigDir()
+	// Find valid config directory
+	if _, err := os.Stat(path.Join(userConfigDir, "stormfetch/config.yaml")); err == nil {
+		configPath = path.Join(userConfigDir, "stormfetch/config.yaml")
+	} else if _, err := os.Stat(path.Join(systemConfigDir, "stormfetch/config.yaml")); err == nil {
+		configPath = path.Join(systemConfigDir, "stormfetch/config.yaml")
+	} else {
+		log.Fatalf("Config file not found: %s", err.Error())
+	}
+	// Parse config
+	bytes, err := os.ReadFile(configPath)
+	if err != nil {
+		log.Fatal(err)
+	}
+	err = yaml.Unmarshal(bytes, &config)
+	if err != nil {
+		log.Fatal(err)
+	}
+	if config.FetchScript == "" {
+		log.Fatalf("Fetch script path is empty")
+	} else if config.FetchScript != "auto" {
+		stat, err := os.Stat(config.FetchScript)
+		if err != nil {
+			log.Fatalf("Fetch script file not found: %s", err.Error())
+		} else if stat.IsDir() {
+			log.Fatalf("Fetch script path points to a directory")
+		}
+	}
+	if _, err := os.Stat(path.Join(userConfigDir, "stormfetch/fetch_script.sh")); err == nil {
+		fetchScriptPath = path.Join(userConfigDir, "stormfetch/fetch_script.sh")
+	} else if _, err := os.Stat(path.Join(systemConfigDir, "stormfetch/fetch_script.sh")); err == nil {
+		fetchScriptPath = path.Join(systemConfigDir, "stormfetch/fetch_script.sh")
+	} else {
+		log.Fatalf("Fetch script file not found: %s", err.Error())
+	}
+}
+
+func readFlags() {
+	flag.StringVar(&config.Ascii, "ascii", config.Ascii, "Set distro ascii")
+	flag.StringVar(&config.DistroName, "distro-name", config.DistroName, "Set distro name")
+	flag.BoolVar(&TimeTaken, "time-taken", false, "Show time taken for fetched information")
+	flag.Parse()
+}
+
+func SetupFetchEnv(showTimeTaken bool) []string {
+	var env = make(map[string]string)
+	setVariable := func(key string, setter func() string) {
+		start := time.Now().UnixMilli()
+		env[key] = setter()
+		end := time.Now().UnixMilli()
+		if showTimeTaken {
+			fmt.Printf("Setting '%s' took %d milliseconds\n", key, end-start)
+		}
+	}
+	setVariable("PACKAGES", func() string { return GetInstalledPackages() })
+	setVariable("DISTRO_LONG_NAME", func() string { return GetDistroInfo().LongName })
+	setVariable("DISTRO_SHORT_NAME", func() string { return GetDistroInfo().ShortName })
+	setVariable("CPU_MODEL", func() string { return GetCPUModel() })
+	setVariable("MOTHERBOARD", func() string { return GetMotherboardModel() })
+	setVariable("CPU_THREADS", func() string { return strconv.Itoa(GetCPUThreads()) })
+	start := time.Now().UnixMilli()
+	memory := GetMemoryInfo()
+	end := time.Now().UnixMilli()
+	if showTimeTaken {
+		fmt.Printf("Setting '%s' took %d milliseconds\n", "MEM_*", end-start)
+	}
+	if memory != nil {
+		env["MEM_TOTAL"] = strconv.Itoa(memory.MemTotal)
+		env["MEM_USED"] = strconv.Itoa(memory.MemTotal - memory.MemAvailable)
+		env["MEM_FREE"] = strconv.Itoa(memory.MemAvailable)
+	}
+	start = time.Now().UnixMilli()
+	partitions := GetMountedPartitions(config.HiddenPartitions, config.HiddenFilesystems)
+	end = time.Now().UnixMilli()
+	if showTimeTaken {
+		fmt.Printf("Setting '%s' took %d milliseconds\n", "PARTITION_*", end-start)
+	}
+	if len(partitions) != 0 {
+		env["MOUNTED_PARTITIONS"] = strconv.Itoa(len(partitions))
+		for i, part := range partitions {
+			env["PARTITION"+strconv.Itoa(i+1)+"_DEVICE"] = part.Device
+			env["PARTITION"+strconv.Itoa(i+1)+"_MOUNTPOINT"] = part.MountPoint
+			if part.Label != "" {
+				env["PARTITION"+strconv.Itoa(i+1)+"_LABEL"] = part.Label
+			}
+			if part.FileystemType != "" && config.ShowFSType {
+				env["PARTITION"+strconv.Itoa(i+1)+"_TYPE"] = part.FileystemType
+			}
+			env["PARTITION"+strconv.Itoa(i+1)+"_TOTAL_SIZE"] = FormatBytes(part.TotalSize)
+			env["PARTITION"+strconv.Itoa(i+1)+"_USED_SIZE"] = FormatBytes(part.UsedSize)
+			env["PARTITION"+strconv.Itoa(i+1)+"_FREE_SIZE"] = FormatBytes(part.FreeSize)
+		}
+	}
+	setVariable("DE_WM", func() string { return GetDEWM() })
+	setVariable("USER_SHELL", func() string { return GetShell() })
+	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()
+	if showTimeTaken {
+		fmt.Printf("Setting '%s' took %d milliseconds\n", "MONITOR_*", end-start)
+	}
+	if len(monitors) != 0 {
+		env["CONNECTED_MONITORS"] = strconv.Itoa(len(monitors))
+		for i, monitor := range monitors {
+			env["MONITOR"+strconv.Itoa(i+1)] = monitor
+		}
+	}
+	start = time.Now().UnixMilli()
+	gpus := GetGPUModels()
+	end = time.Now().UnixMilli()
+	if showTimeTaken {
+		fmt.Printf("Setting '%s' took %d milliseconds\n", "GPU_*", end-start)
+	}
+	if len(gpus) != 0 {
+		env["CONNECTED_GPUS"] = strconv.Itoa(len(gpus))
+		for i, gpu := range gpus {
+			if gpu == "" {
+				continue
+			}
+			env["GPU"+strconv.Itoa(i+1)] = gpu
+		}
+	}
+
+	var ret = make([]string, len(env))
+	i := 0
+	for key, value := range env {
+		ret[i] = fmt.Sprintf("%s=%s", key, value)
+		i++
+	}
+	return ret
+}
+
+func runStormfetch() {
+	// Fetch ascii art
+	asciiArt := GetDistroAsciiArt()
+
+	// Setup color map
+	colorMap := setupColorMap(asciiArt)
+	if len(colorMap) > 0 {
+		asciiArt = os.Expand(asciiArt, func(s string) string {
+			return colorMap[s]
+		})
+
+		asciiArt = strings.SplitN(asciiArt, "\n", 2)[1]
+	}
+
+	asciiSplit := strings.Split(asciiArt, "\n")
+	asciiNoColor := StripAnsii(asciiArt)
+
+	// Execute fetch script
+	cmd := exec.Command("/bin/bash", fetchScriptPath)
+	cmd.Dir = path.Dir(fetchScriptPath)
+	cmd.Env = os.Environ()
+	cmd.Env = append(cmd.Env, SetupFetchEnv(TimeTaken)...)
+	cmd.Env = append(cmd.Env, "C0=\033[0m")
+	for key, value := range colorMap {
+		cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", key, value))
+	}
+	out, err := cmd.Output()
+	if err != nil {
+		log.Fatalf("Error: Could not run fetch script: %s", err)
+	}
+	// Print Distro Information
+	maxWidth := 0
+	for _, line := range strings.Split(asciiNoColor, "\n") {
+		if len(line) > maxWidth {
+			maxWidth = len(line)
+		}
+	}
+	final := ""
+	y := len(asciiSplit)
+	if len(asciiSplit) < len(strings.Split(string(out), "\n")) {
+		y = len(strings.Split(string(out), "\n"))
+	}
+	for lineIndex := 0; lineIndex < y; lineIndex++ {
+		line := ""
+		for i := 0; i < maxWidth+5; i++ {
+			line = line + " "
+		}
+		lastAsciiColor := ""
+		if lineIndex < len(asciiSplit) {
+			line = asciiSplit[lineIndex]
+			lineVisibleLength := len(strings.Split(asciiNoColor, "\n")[lineIndex])
+			if lineIndex != 0 {
+				r := regexp.MustCompile("\033[38;5;[0-9]+m")
+				matches := r.FindAllString(asciiSplit[lineIndex-1], -1)
+				if len(matches) != 0 {
+					lastAsciiColor = r.FindAllString(asciiSplit[lineIndex-1], -1)[len(matches)-1]
+				}
+			}
+			for i := lineVisibleLength; i < maxWidth+5; i++ {
+				line = line + " "
+			}
+			asciiSplit[lineIndex] = lastAsciiColor + line
+		}
+		str := string(out)
+		if lineIndex < len(strings.Split(str, "\n")) {
+			line = line + colorMap["C0"] + strings.Split(str, "\n")[lineIndex]
+		}
+		final += lastAsciiColor + line + "\n"
+	}
+	final = strings.TrimRight(final, "\n\t ")
+	fmt.Println(final + "\033[0m")
+}

src/memory.go

@@ -0,0 +1,57 @@
+package main
+
+import (
+	"bufio"
+	"os"
+	"strconv"
+	"strings"
+)
+
+type Memory struct {
+	MemTotal     int
+	MemFree      int
+	MemAvailable int
+}
+
+func GetMemoryInfo() *Memory {
+	toInt := func(raw string) int {
+		if raw == "" {
+			return 0
+		}
+		res, err := strconv.Atoi(raw)
+		if err != nil {
+			panic(err)
+		}
+		return res
+	}
+
+	parseLine := func(raw string) (key string, value int) {
+		text := strings.ReplaceAll(raw[:len(raw)-2], " ", "")
+		keyValue := strings.Split(text, ":")
+		return keyValue[0], toInt(keyValue[1])
+	}
+
+	if _, err := os.Stat("/proc/meminfo"); err != nil {
+		return nil
+	}
+	file, err := os.Open("/proc/meminfo")
+	if err != nil {
+		panic(err)
+	}
+	defer file.Close()
+	bufio.NewScanner(file)
+	scanner := bufio.NewScanner(file)
+	res := Memory{}
+	for scanner.Scan() {
+		key, value := parseLine(scanner.Text())
+		switch key {
+		case "MemTotal":
+			res.MemTotal = value / 1024
+		case "MemFree":
+			res.MemFree = value / 1024
+		case "MemAvailable":
+			res.MemAvailable = value / 1024
+		}
+	}
+	return &res
+}

src/network.go

@@ -0,0 +1,15 @@
+package main
+
+import "net"
+
+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()
+}

src/partitions.go

@@ -0,0 +1,119 @@
+package main
+
+import (
+	"os"
+	"path/filepath"
+	"slices"
+	"strings"
+	"syscall"
+)
+
+type partition struct {
+	Device        string
+	MountPoint    string
+	Label         string
+	FileystemType string
+	TotalSize     uint64
+	UsedSize      uint64
+	FreeSize      uint64
+}
+
+func GetMountedPartitions(hiddenPartitions, hiddenFilesystems []string) []partition {
+	// Get all filesystem and partition labels
+	fslabels, err := os.ReadDir("/dev/disk/by-label")
+	if err != nil && !os.IsNotExist(err) {
+		return nil
+	}
+	partlabels, err := os.ReadDir("/dev/disk/by-partlabel")
+	if err != nil && !os.IsNotExist(err) {
+		return nil
+	}
+	labels := make(map[string]string)
+	for _, entry := range partlabels {
+		link, err := filepath.EvalSymlinks(filepath.Join("/dev/disk/by-partlabel/", entry.Name()))
+		if err != nil {
+			continue
+		}
+		labels[link] = entry.Name()
+	}
+	for _, entry := range fslabels {
+		link, err := filepath.EvalSymlinks(filepath.Join("/dev/disk/by-label/", entry.Name()))
+		if err != nil {
+			continue
+		}
+		labels[link] = entry.Name()
+	}
+
+	// Get all mounted partitions
+	file, err := os.ReadFile("/proc/mounts")
+	if err != nil {
+		return nil
+	}
+
+	var partitions []partition
+	for _, entry := range strings.Split(string(file), "\n") {
+		fields := strings.Fields(entry)
+		if entry == "" {
+			continue
+		}
+
+		// Skip virtual partitions not under /dev
+		if !strings.HasPrefix(fields[0], "/dev") {
+			continue
+		}
+
+		// Skip partition if explicitly hidden
+		if slices.Contains(hiddenPartitions, fields[0]) {
+			continue
+		}
+
+		// Skip filesystem if explicitely hidden
+		if slices.Contains(hiddenFilesystems, fields[2]) {
+			continue
+		}
+
+		p := partition{
+			fields[0],
+			fields[1],
+			"",
+			fields[2],
+			0,
+			0,
+			0,
+		}
+
+		// Skip already added partitions
+		skip := false
+		for _, part := range partitions {
+			if part.Device == p.Device {
+				skip = true
+			}
+		}
+		if skip {
+			continue
+		}
+
+		// Set partition label if available
+		if value, ok := labels[p.Device]; ok {
+			p.Label = value
+		}
+
+		// Get partition total, used and free space
+		buf := new(syscall.Statfs_t)
+		err = syscall.Statfs(p.MountPoint, buf)
+		if err != nil {
+			continue
+		}
+		totalBlocks := buf.Blocks
+		freeBlocks := buf.Bfree
+		usedBlocks := totalBlocks - freeBlocks
+		blockSize := uint64(buf.Bsize)
+
+		p.TotalSize = totalBlocks * blockSize
+		p.FreeSize = freeBlocks * blockSize
+		p.UsedSize = usedBlocks * blockSize
+
+		partitions = append(partitions, p)
+	}
+	return partitions
+}

src/pms.go

@@ -0,0 +1,53 @@
+package main
+
+import (
+	"fmt"
+	"os/exec"
+	"strings"
+)
+
+type PackageManager struct {
+	Name               string
+	ExecutableName     string
+	PackageListCommand string
+}
+
+var PackageManagers = []PackageManager{
+	{Name: "dpkg", ExecutableName: "dpkg", PackageListCommand: "dpkg-query -f '${Package}\\n' -W"},
+	{Name: "pacman", ExecutableName: "pacman", PackageListCommand: "pacman -Q"},
+	{Name: "rpm", ExecutableName: "rpm", PackageListCommand: "rpm -qa"},
+	{Name: "xbps", ExecutableName: "xbps-query", PackageListCommand: "xbps-query -l"},
+	{Name: "bpm", ExecutableName: "bpm", PackageListCommand: "bpm list -n"},
+	{Name: "portage", ExecutableName: "emerge", PackageListCommand: "find /var/db/pkg/*/ -mindepth 1 -maxdepth 1"},
+	{Name: "flatpak", ExecutableName: "flatpak", PackageListCommand: "flatpak list"},
+	{Name: "snap", ExecutableName: "snap", PackageListCommand: "snap list | tail +2"},
+}
+
+func (pm *PackageManager) CountPackages() int {
+	// Return 0 if package manager is not found
+	if _, err := exec.LookPath(pm.ExecutableName); err != nil {
+		return 0
+	}
+
+	output, err := exec.Command("/bin/sh", "-c", pm.PackageListCommand).Output()
+	if err != nil {
+		return 0
+	}
+
+	return strings.Count(string(output), "\n")
+}
+
+func GetInstalledPackages() (ret string) {
+	for _, pm := range PackageManagers {
+		count := pm.CountPackages()
+		if count > 0 {
+			if ret == "" {
+				ret += fmt.Sprintf("%d (%s)", count, pm.Name)
+			} else {
+				ret += fmt.Sprintf(" %d (%s)", count, pm.Name)
+			}
+		}
+	}
+
+	return ret
+}

src/system.go

@@ -0,0 +1,165 @@
+package main
+
+import (
+	"os"
+	"os/exec"
+	"path"
+	"strings"
+
+	"github.com/mitchellh/go-ps"
+)
+
+type DistroInfo struct {
+	ID        string
+	LongName  string
+	ShortName string
+}
+
+func GetDistroInfo() DistroInfo {
+	info := DistroInfo{
+		ID:        "unknown",
+		LongName:  "Unknown",
+		ShortName: "Unknown",
+	}
+	if strings.TrimSpace(config.DistroName) != "" {
+		info.LongName = strings.TrimSpace(config.DistroName)
+		info.ShortName = strings.TrimSpace(config.DistroName)
+	}
+
+	// Detect release file location
+	var releaseFile string
+	if _, err := os.Stat("/bedrock/etc/os-release"); os.Getenv("BEDROCK_RESTRICT") == "" && err == nil {
+		// Using Bedrock Linux
+		releaseFile = "/bedrock/etc/os-release"
+	} else if _, err := os.Stat("/etc/os-release"); err == nil {
+		// Using a regular linux distribution
+		releaseFile = "/etc/os-release"
+	} else {
+		return info
+	}
+
+	releaseMap, err := ReadKeyValueFile(releaseFile)
+	if err != nil {
+		return info
+	}
+
+	if id, ok := releaseMap["ID"]; ok {
+		info.ID = id
+	}
+	if longName, ok := releaseMap["PRETTY_NAME"]; ok && info.LongName == "Unknown" {
+		info.LongName = longName
+	}
+	if shortName, ok := releaseMap["NAME"]; ok && info.ShortName == "Unknown" {
+		info.ShortName = shortName
+	}
+	return info
+}
+
+func GetDistroAsciiArt() string {
+	defaultAscii :=
+		`    .--.
+   |o_o |
+   |:_/ |
+  //   \ \
+ (|     | )
+/'\_   _/'\
+\___)=(___/ `
+	var id string
+	if config.Ascii == "auto" {
+		id = GetDistroInfo().ID
+	} else {
+		id = config.Ascii
+	}
+	userConfDir, err := os.UserConfigDir()
+	if err != nil {
+		if _, err := os.Stat(path.Join(systemConfigDir, "stormfetch/ascii/", id)); err == nil {
+			bytes, err := os.ReadFile(path.Join(systemConfigDir, "stormfetch/ascii/", id))
+			if err != nil {
+				return defaultAscii
+			}
+			return string(bytes)
+		} else {
+			return defaultAscii
+		}
+	}
+	if _, err := os.Stat(path.Join(userConfDir, "stormfetch/ascii/", id)); err == nil {
+		bytes, err := os.ReadFile(path.Join(userConfDir, "stormfetch/ascii/", id))
+		if err != nil {
+			return defaultAscii
+		}
+		return string(bytes)
+	} else if _, err := os.Stat(path.Join(systemConfigDir, "stormfetch/ascii/", id)); err == nil {
+		bytes, err := os.ReadFile(path.Join(systemConfigDir, "stormfetch/ascii/", id))
+		if err != nil {
+			return defaultAscii
+		}
+		return strings.TrimRight(string(bytes), "\n\t ")
+	} else {
+		return defaultAscii
+	}
+}
+
+func GetInitSystem() string {
+	runCommand := func(command string) string {
+		cmd := exec.Command("/bin/bash", "-c", command)
+		workdir, err := os.Getwd()
+		if err != nil {
+			return ""
+		}
+		cmd.Dir = workdir
+		cmd.Env = os.Environ()
+		out, err := cmd.Output()
+		if err != nil {
+			return ""
+		}
+		return strings.TrimSpace(string(out))
+	}
+
+	process, err := ps.FindProcess(1)
+	if err != nil {
+		return ""
+	}
+
+	// Special cases
+	// OpenRC check
+	if _, err := os.Stat("/usr/sbin/openrc"); err == nil {
+		return "OpenRC " + runCommand("openrc --version | awk '{print $3}'")
+	}
+
+	// Default PID 1 process name checking
+	switch process.Executable() {
+	case "systemd":
+		return "Systemd " + runCommand("systemctl --version | head -n1 | awk '{print $2}'")
+	case "runit":
+		return "Runit"
+	case "dinit":
+		return "Dinit " + runCommand("dinit --version | head -n1 | awk '{print substr($3, 1, length($3)-1)}'")
+	case "enit":
+		return "Enit " + runCommand("enit --version | awk '{print $3}'")
+	default:
+		return process.Executable()
+	}
+}
+
+func GetLibc() string {
+	checkLibcOutput, err := exec.Command("ldd", "/usr/bin/ls").Output()
+	if err != nil {
+		return "Unknown"
+	}
+
+	if strings.Contains(string(checkLibcOutput), "ld-musl") {
+		// Using Musl Libc
+		output, _ := exec.Command("ldd").CombinedOutput()
+		return "Musl " + strings.TrimPrefix(strings.Split(strings.TrimSpace(string(output)), "\n")[1], "Version ")
+	} else {
+		// Using Glibc
+		cmd := exec.Command("ldd", "--version")
+		output, err := cmd.Output()
+		if err != nil {
+			return "Glibc"
+		}
+		outputSplit := strings.Split(strings.Split(strings.TrimSpace(string(output)), "\n")[0], " ")
+		ver := outputSplit[len(outputSplit)-1]
+		return "Glibc " + ver
+	}
+}

src/user.go

@@ -0,0 +1,127 @@
+package main
+
+import (
+	"github.com/mitchellh/go-ps"
+	"log"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"slices"
+	"strconv"
+	"strings"
+)
+
+func GetShell() string {
+	runCommand := func(command string) string {
+		cmd := exec.Command("/bin/bash", "-c", command)
+		workdir, err := os.Getwd()
+		if err != nil {
+			return ""
+		}
+		cmd.Dir = workdir
+		cmd.Env = os.Environ()
+		out, err := cmd.Output()
+		if err != nil {
+			return ""
+		}
+		return strings.TrimSpace(string(out))
+	}
+	file, err := os.ReadFile("/etc/passwd")
+	if err != nil {
+		return ""
+	}
+	str := string(file)
+	shell := ""
+
+	for _, line := range strings.Split(str, "\n") {
+		if strings.TrimSpace(line) == "" {
+			continue
+		}
+		userInfo := strings.Split(line, ":")
+		if userInfo[2] == strconv.Itoa(os.Getuid()) {
+			shell = userInfo[6]
+		}
+	}
+	shellName := filepath.Base(shell)
+	switch shellName {
+	case "dash":
+		return "Dash"
+	case "bash":
+		return "Bash " + runCommand("echo $BASH_VERSION")
+	case "zsh":
+		return "Zsh " + runCommand("$SHELL --version | awk '{print $2}'")
+	case "fish":
+		return "Fish " + runCommand("$SHELL --version | awk '{print $3}'")
+	case "nu":
+		return "Nushell " + runCommand("$SHELL --version")
+	default:
+		return "Unknown"
+	}
+}
+
+func GetDEWM() string {
+	processes, err := ps.Processes()
+	if err != nil {
+		log.Fatalf("Error: could not get processes: %s", err)
+	}
+	var executables []string
+	for _, process := range processes {
+		executables = append(executables, process.Executable())
+	}
+
+	processExists := func(process string) bool {
+		return slices.Contains(executables, process)
+	}
+	runCommand := func(command string) string {
+		cmd := exec.Command("/bin/bash", "-c", command)
+		workdir, err := os.Getwd()
+		if err != nil {
+			return ""
+		}
+		cmd.Dir = workdir
+		cmd.Env = os.Environ()
+		out, err := cmd.Output()
+		if err != nil {
+			return ""
+		}
+		return strings.TrimSpace(string(out))
+	}
+	if processExists("plasmashell") {
+		return "KDE Plasma " + runCommand("plasmashell --version | awk '{print $2}'")
+	} else if processExists("gnome-session") {
+		return "Gnome " + runCommand("gnome-shell --version | awk '{print $3}'")
+	} else if processExists("xfce4-session") {
+		return "XFCE " + runCommand("xfce4-session --version | head -n1 | awk '{print $2}'")
+	} else if processExists("cinnamon") {
+		return "Cinnamon " + runCommand("cinnamon --version | awk '{print $3}'")
+	} else if processExists("mate-panel") {
+		return "MATE " + runCommand("mate-about --version | awk '{print $4}'")
+	} else if processExists("lxsession") {
+		return "LXDE"
+	} else if processExists("i3") || processExists("i3-with-shmlog") {
+		return "i3 " + runCommand("i3 --version | awk '{print $3}'")
+	} else if processExists("sway") {
+		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}'")
+	}
+	return ""
+}
+
+func GetDisplayProtocol() string {
+	protocol := os.Getenv("XDG_SESSION_TYPE")
+	if protocol == "x11" {
+		return "X11"
+	} else if protocol == "wayland" {
+		return "Wayland"
+	}
+	return ""
+}

src/utils.go

@@ -0,0 +1,58 @@
+package main
+
+import (
+	"fmt"
+	"math"
+	"os"
+	"regexp"
+	"strings"
+)
+
+func FormatBytes(bytes uint64) string {
+	var suffixes [6]string
+	suffixes[0] = "B"
+	suffixes[1] = "KiB"
+	suffixes[2] = "MiB"
+	suffixes[3] = "GiB"
+	suffixes[4] = "TiB"
+	suffixes[5] = "PiB"
+
+	bf := float64(bytes)
+	for _, unit := range suffixes {
+		if math.Abs(bf) < 1024.0 {
+			return fmt.Sprintf("%3.1f %s", bf, unit)
+		}
+		bf /= 1024.0
+	}
+	return fmt.Sprintf("%.1fYiB", bf)
+}
+
+func StripAnsii(str string) string {
+	const ansi = "[\u001B\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[a-zA-Z\\d]*)*)?\u0007)|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PRZcf-ntqry=><~]))"
+	var re = regexp.MustCompile(ansi)
+	return re.ReplaceAllString(str, "")
+}
+
+func ReadKeyValueFile(filepath string) (map[string]string, error) {
+	ret := make(map[string]string)
+	if _, err := os.Stat(filepath); err != nil {
+		return nil, err
+	}
+	bytes, err := os.ReadFile(filepath)
+	if err != nil {
+		return nil, err
+	}
+	str := string(bytes)
+	lines := strings.Split(str, "\n")
+	for _, line := range lines {
+		if len(strings.Split(line, "=")) >= 2 {
+			key := strings.SplitN(line, "=", 2)[0]
+			value := strings.SplitN(line, "=", 2)[1]
+			if strings.HasPrefix(value, "\"") && strings.HasSuffix(value, "\"") {
+				value = value[1 : len(value)-1]
+			}
+			ret[key] = value
+		}
+	}
+	return ret, nil
+}

utils.go

@@ -1,453 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"fmt"
-	"github.com/BurntSushi/xgb"
-	"github.com/BurntSushi/xgb/xinerama"
-	"github.com/jackmordaunt/ghw"
-	"github.com/mitchellh/go-ps"
-	"log"
-	"math"
-	"os"
-	"os/exec"
-	"path"
-	"path/filepath"
-	"regexp"
-	"slices"
-	"strconv"
-	"strings"
-	"syscall"
-)
-
-type DistroInfo struct {
-	ID        string
-	LongName  string
-	ShortName string
-}
-
-func getDistroInfo() DistroInfo {
-	distroID := ""
-	var releaseMap = make(map[string]string)
-	if _, err := os.Stat("/etc/os-release"); err == nil {
-		releaseMap, err = ReadKeyValueFile("/etc/os-release")
-		if err != nil {
-			return DistroInfo{
-				ID:        "unknown",
-				LongName:  "Unknown",
-				ShortName: "Unknown",
-			}
-		}
-		if value, ok := releaseMap["ID"]; ok {
-			distroID = value
-		}
-	}
-
-	switch distroID {
-	default:
-		if id, ok := releaseMap["ID"]; ok {
-			if longName, ok := releaseMap["PRETTY_NAME"]; ok {
-				if shortName, ok := releaseMap["NAME"]; ok {
-					return DistroInfo{
-						ID:        id,
-						LongName:  longName,
-						ShortName: shortName,
-					}
-				}
-			}
-		}
-		return DistroInfo{
-			ID:        "unknown",
-			LongName:  "Unknown",
-			ShortName: "Unknown",
-		}
-	}
-}
-
-func getDistroAsciiArt() string {
-	defaultAscii :=
-		`    .--.
-   |o_o |
-   |:_/ |
-  //   \ \
- (|     | )
-/'\_   _/'\
-\___)=(___/ `
-	var id string
-	if config.Ascii == "auto" {
-		id = getDistroInfo().ID
-	} else {
-		id = config.Ascii
-	}
-	userConfDir, err := os.UserConfigDir()
-	if err != nil {
-		if _, err := os.Stat(path.Join("/etc/stormfetch/ascii/", id)); err == nil {
-			bytes, err := os.ReadFile(path.Join("/etc/stormfetch/ascii/", id))
-			if err != nil {
-				return defaultAscii
-			}
-			return string(bytes)
-		} else {
-			return defaultAscii
-		}
-	}
-	if _, err := os.Stat(path.Join(userConfDir, "stormfetch/ascii/", id)); err == nil {
-		bytes, err := os.ReadFile(path.Join(userConfDir, "stormfetch/ascii/", id))
-		if err != nil {
-			return defaultAscii
-		}
-		return string(bytes)
-	} else if _, err := os.Stat(path.Join("/etc/stormfetch/ascii/", id)); err == nil {
-		bytes, err := os.ReadFile(path.Join("/etc/stormfetch/ascii/", id))
-		if err != nil {
-			return defaultAscii
-		}
-		return string(bytes)
-	} else {
-		return defaultAscii
-	}
-}
-
-func getCPUName() string {
-	cpu, err := ghw.CPU()
-	if err != nil {
-		return ""
-	}
-	if len(cpu.Processors) == 0 {
-		return ""
-	}
-	return cpu.Processors[0].Model
-}
-
-func getCPUThreads() int {
-	cpu, err := ghw.CPU()
-	if err != nil {
-		return 0
-	}
-	return int(cpu.TotalThreads)
-}
-
-func getGPUName() string {
-	null, _ := os.Open(os.DevNull)
-	serr := os.Stderr
-	os.Stderr = null
-	gpu, err := ghw.GPU()
-	defer null.Close()
-	os.Stderr = serr
-	if err != nil {
-		return ""
-	}
-	for _, graphics := range gpu.GraphicsCards {
-		if graphics.DeviceInfo != nil {
-			return graphics.DeviceInfo.Product.Name
-		}
-	}
-	return ""
-}
-
-type Memory struct {
-	MemTotal     int
-	MemFree      int
-	MemAvailable int
-}
-
-func GetMemoryInfo() *Memory {
-	toInt := func(raw string) int {
-		if raw == "" {
-			return 0
-		}
-		res, err := strconv.Atoi(raw)
-		if err != nil {
-			panic(err)
-		}
-		return res
-	}
-
-	parseLine := func(raw string) (key string, value int) {
-		text := strings.ReplaceAll(raw[:len(raw)-2], " ", "")
-		keyValue := strings.Split(text, ":")
-		return keyValue[0], toInt(keyValue[1])
-	}
-
-	if _, err := os.Stat("/proc/meminfo"); err != nil {
-		return nil
-	}
-	file, err := os.Open("/proc/meminfo")
-	if err != nil {
-		panic(err)
-	}
-	defer file.Close()
-	bufio.NewScanner(file)
-	scanner := bufio.NewScanner(file)
-	res := Memory{}
-	for scanner.Scan() {
-		key, value := parseLine(scanner.Text())
-		switch key {
-		case "MemTotal":
-			res.MemTotal = value / 1024
-		case "MemFree":
-			res.MemFree = value / 1024
-		case "MemAvailable":
-			res.MemAvailable = value / 1024
-		}
-	}
-	return &res
-}
-
-func GetShell() string {
-	runCommand := func(command string) string {
-		cmd := exec.Command("/bin/bash", "-c", command)
-		workdir, err := os.Getwd()
-		if err != nil {
-			return ""
-		}
-		cmd.Dir = workdir
-		cmd.Env = os.Environ()
-		out, err := cmd.Output()
-		if err != nil {
-			return ""
-		}
-		return strings.TrimSpace(string(out))
-	}
-	file, err := os.ReadFile("/etc/passwd")
-	if err != nil {
-		return ""
-	}
-	str := string(file)
-	shell := ""
-
-	for _, line := range strings.Split(str, "\n") {
-		if strings.TrimSpace(line) == "" {
-			continue
-		}
-		userInfo := strings.Split(line, ":")
-		if userInfo[2] == strconv.Itoa(os.Getuid()) {
-			shell = userInfo[6]
-		}
-	}
-	shellName := filepath.Base(shell)
-	switch shellName {
-	case "dash":
-		return "Dash"
-	case "bash":
-		return "Bash " + runCommand("echo $BASH_VERSION")
-	case "zsh":
-		return "Zsh " + runCommand("$SHELL --version | awk '{print $2}'")
-	case "fish":
-		return "Fish " + runCommand("$SHELL --version | awk '{print $3}'")
-	default:
-		return "Unknown"
-	}
-}
-
-func GetDEWM() string {
-	processes, err := ps.Processes()
-	if err != nil {
-		log.Fatal(err)
-	}
-	var executables []string
-	for _, process := range processes {
-		executables = append(executables, process.Executable())
-	}
-
-	processExists := func(process string) bool {
-		return slices.Contains(executables, process)
-	}
-	runCommand := func(command string) string {
-		cmd := exec.Command("/bin/bash", "-c", command)
-		workdir, err := os.Getwd()
-		if err != nil {
-			return ""
-		}
-		cmd.Dir = workdir
-		cmd.Env = os.Environ()
-		out, err := cmd.Output()
-		if err != nil {
-			return ""
-		}
-		return strings.TrimSpace(string(out))
-	}
-
-	if processExists("plasmashell") {
-		return "KDE Plasma " + runCommand("plasmashell --version | awk '{print $2}'")
-	} else if processExists("gnome-session") {
-		return "Gnome " + runCommand("gnome-shell --version | awk '{print $3}'")
-	} else if processExists("xfce4-session") {
-		return "XFCE " + runCommand("xfce4-session --version | grep xfce4-session | awk '{print $2}'")
-	} else if processExists("cinnamon") {
-		return "Cinnamon " + runCommand("cinnamon --version | awk '{print $3}'")
-	} else if processExists("mate-panel") {
-		return "MATE " + runCommand("mate-about --version | awk '{print $4}'")
-	} else if processExists("lxsession") {
-		return "LXDE"
-	} else if processExists("sway") {
-		return "Sway " + runCommand("sway --version | awk '{print $3}'")
-	} else if processExists("bspwm") {
-		return "Bspwm " + runCommand("bspwm -v")
-	} else if processExists("icewm-session") {
-		return "IceWM " + runCommand("icewm --version | awk '{print $2}'")
-	}
-	return ""
-}
-
-func GetDisplayProtocol() string {
-	protocol := os.Getenv("XDG_SESSION_TYPE")
-	if protocol == "x11" {
-		return "X11"
-	} else if protocol == "wayland" {
-		return "Wayland"
-	}
-	return ""
-}
-
-func getMonitorResolution() []string {
-	var monitors []string
-	if GetDisplayProtocol() == "X11" {
-		conn, err := xgb.NewConn()
-		if err != nil {
-			return nil
-		}
-		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)))
-		}
-	}
-	return monitors
-}
-
-type partition struct {
-	Device     string
-	MountPoint string
-	Label      string
-	TotalSize  uint64
-	UsedSize   uint64
-	FreeSize   uint64
-}
-
-func getMountedPartitions() []partition {
-	partuuids, err := os.ReadDir("/dev/disk/by-partuuid")
-	if err != nil {
-		return nil
-	}
-
-	partlabels, err := os.ReadDir("/dev/disk/by-partlabel")
-	if err != nil && !os.IsNotExist(err) {
-		return nil
-	}
-	labels := make(map[string]string)
-	for _, entry := range partlabels {
-		link, err := filepath.EvalSymlinks(filepath.Join("/dev/disk/by-partlabel/", entry.Name()))
-		if err != nil {
-			continue
-		}
-		labels[link] = entry.Name()
-	}
-
-	bytes, err := os.ReadFile("/proc/mounts")
-	if err != nil {
-		return nil
-	}
-
-	mountsRaw := strings.Split(string(bytes), "\n")
-	mounts := make(map[string]string)
-
-	for i := 0; i < len(mountsRaw); i++ {
-		split := strings.Split(mountsRaw[i], " ")
-		if len(split) <= 2 {
-			continue
-		}
-		mounts[split[0]] = split[1]
-	}
-
-	var partitions []partition
-	for _, entry := range partuuids {
-		link, err := filepath.EvalSymlinks(filepath.Join("/dev/disk/by-partuuid/", entry.Name()))
-		if err != nil {
-			continue
-		}
-		if _, ok := mounts[link]; !ok {
-			continue
-		}
-		p := partition{
-			link,
-			mounts[link],
-			"",
-			0,
-			0,
-			0,
-		}
-		if value, ok := labels[link]; ok {
-			p.Label = value
-		}
-		buf := new(syscall.Statfs_t)
-		err = syscall.Statfs(p.MountPoint, buf)
-		if err != nil {
-			log.Fatal(err)
-		}
-		totalBlocks := buf.Blocks
-		freeBlocks := buf.Bfree
-		usedBlocks := totalBlocks - freeBlocks
-		blockSize := uint64(buf.Bsize)
-
-		p.TotalSize = totalBlocks * blockSize
-		p.FreeSize = freeBlocks * blockSize
-		p.UsedSize = usedBlocks * blockSize
-
-		partitions = append(partitions, p)
-	}
-	return partitions
-}
-
-func FormatBytes(bytes uint64) string {
-	var suffixes [6]string
-	suffixes[0] = "B"
-	suffixes[1] = "KiB"
-	suffixes[2] = "MiB"
-	suffixes[3] = "GiB"
-	suffixes[4] = "TiB"
-	suffixes[5] = "PiB"
-
-	bf := float64(bytes)
-	for _, unit := range suffixes {
-		if math.Abs(bf) < 1024.0 {
-			return fmt.Sprintf("%3.1f %s", bf, unit)
-		}
-		bf /= 1024.0
-	}
-	return fmt.Sprintf("%.1fYiB", bf)
-}
-
-func StripAnsii(str string) string {
-	const ansi = "[\u001B\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[a-zA-Z\\d]*)*)?\u0007)|(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PRZcf-ntqry=><~]))"
-	var re = regexp.MustCompile(ansi)
-	return re.ReplaceAllString(str, "")
-}
-
-func ReadKeyValueFile(filepath string) (map[string]string, error) {
-	ret := make(map[string]string)
-	if _, err := os.Stat(filepath); err != nil {
-		return nil, err
-	}
-	bytes, err := os.ReadFile(filepath)
-	if err != nil {
-		return nil, err
-	}
-	str := string(bytes)
-	lines := strings.Split(str, "\n")
-	for _, line := range lines {
-		if len(strings.Split(line, "=")) >= 2 {
-			key := strings.SplitN(line, "=", 2)[0]
-			value := strings.SplitN(line, "=", 2)[1]
-			if strings.HasPrefix(value, "\"") && strings.HasSuffix(value, "\"") {
-				value = value[1 : len(value)-1]
-			}
-			ret[key] = value
-		}
-	}
-	return ret, nil
-}