Added filesystem label detection, btrfs subvolumes should now be grouped under one partition and the filesystem type will now be shown if enabled in config.yaml

.gitignore

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

Makefile

@@ -33,4 +33,6 @@ run: build/stormfetch
 	build/stormfetch
 
 clean:
-	rm -r build/
+	rm -r build/
+
+.PHONY: build

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/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

@@ -3,3 +3,5 @@ fetch_script: auto
 ansii_colors: []
 force_config_ansii: false
 dependency_warning: true
+show_fs_type: true
+hidden_gpus: []

config/fetch_script.sh

@@ -6,18 +6,30 @@ echo -e "${C3}Kernel: ${C4}$(uname -s) $(uname -r)"
 echo -e "${C3}Packages: ${C4}$(get_packages)"
 echo -e "${C3}Shell: ${C4}${USER_SHELL}"
 if [ ! -z "$CPU_MODEL" ]; then echo -e "${C3}CPU: ${C4}${CPU_MODEL} (${CPU_THREADS} threads)"; fi
-if [ ! -z "$GPU_MODEL" ]; then echo -e "${C3}GPU: ${C4}${GPU_MODEL}"; fi
+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 "${!label}" ]; then
+    if [ -z "${!type}" ]; then
-      echo -e "${C3}Partition ${!mountpoint}: ${C4}${!used}/${!total}"
+      if [ -z "${!label}" ]; then
+        echo -e "${C3}Partition ${!mountpoint}: ${C4}${!used}/${!total}"
+      else
+        echo -e "${C3}Partition ${!label}: ${C4}${!used}/${!total}"
+      fi
     else
-      echo -e "${C3}Partition ${!label}: ${C4}${!used}/${!total}"
+      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
 if [ ! -z "$DISPLAY_PROTOCOL" ]; then

config/fetch_script_functions.sh

@@ -20,11 +20,14 @@ get_packages() {
     if command_exists rpm; then
         ARRAY+=("$(rpm -qa | wc -l) (rpm)")
     fi
+    if command_exists xbps-query; then
+        ARRAY+=("$(xbps-query -l | wc -l) (xbps)")
+    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)")
+        ARRAY+=("$(ls -l /var/db/pkg/* | wc -l) (emerge)")
     fi
     if command_exists flatpak; then
         ARRAY+=("$(flatpak list | wc -l) (flatpak)")

go.mod

@@ -14,6 +14,7 @@ require (
 	github.com/jackmordaunt/pcidb v1.0.1 // indirect
 	github.com/jackmordaunt/wmi v1.2.4 // indirect
 	github.com/kr/pretty v0.1.0 // indirect
+	github.com/moby/sys/mountinfo v0.7.1 // indirect
 	golang.org/x/sys v0.3.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 )

go.sum

@@ -15,7 +15,10 @@ github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/mitchellh/go-ps v1.0.0 h1:i6ampVEEF4wQFF+bkYfwYgY+F/uYJDktmvLPf7qIgjc=
 github.com/mitchellh/go-ps v1.0.0/go.mod h1:J4lOc8z8yJs6vUwklHw2XEIiT4z4C40KtWVN3nvg8Pg=
+github.com/moby/sys/mountinfo v0.7.1 h1:/tTvQaSJRr2FshkhXiIpux6fQ2Zvc4j7tAhMTStAG2g=
+github.com/moby/sys/mountinfo v0.7.1/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
 golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

main.go

@@ -1,8 +1,9 @@
 package main
 
 import (
+	"flag"
 	"fmt"
-	yaml "gopkg.in/yaml.v3"
+	"gopkg.in/yaml.v3"
 	"log"
 	"os"
 	"os/exec"
@@ -21,18 +22,26 @@ var config = StormfetchConfig{
 	AnsiiColors:       make([]int, 0),
 	ForceConfigAnsii:  false,
 	DependencyWarning: true,
+	ShowFSType:        false,
+	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"`
 	DependencyWarning bool   `yaml:"dependency_warning"`
+	ShowFSType        bool   `yaml:"show_fs_type"`
+	HiddenGPUS        []int  `yaml:"hidden_gpus"`
 }
 
 func main() {
 	readConfig()
+	readFlags()
+	checkDependencies()
+	runStormfetch()
 }
 
 func readConfig() {
@@ -72,6 +81,15 @@ func readConfig() {
 	} else {
 		log.Fatalf("Fetch script file not found: %s", err.Error())
 	}
+}
+
+func readFlags() {
+	flag.StringVar(&config.Ascii, "ascii", config.Ascii, "help message for flagname")
+	flag.StringVar(&config.DistroName, "distro-name", config.DistroName, "help message for flagname")
+	flag.Parse()
+}
+
+func checkDependencies() {
 	// Show Dependency warning if enabled
 	if config.DependencyWarning {
 		var dependencies []string
@@ -89,6 +107,68 @@ func readConfig() {
 			fmt.Println("You can disable this warning through your stormfetch config")
 		}
 	}
+}
+
+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
+			}
+			if part.Type != "" && config.ShowFSType {
+				env["PARTITION"+strconv.Itoa(i+1)+"_TYPE"] = part.Type
+			}
+			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
+		}
+	}
+	gpus := getGPUNames()
+	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 and apply colors
 	colorMap := make(map[string]string)
 	colorMap["C0"] = "\033[0m"
@@ -152,74 +232,37 @@ func readConfig() {
 		}
 	}
 	final := ""
-	for lineIndex, line := range asciiSplit {
+	y := len(asciiSplit)
-		lineVisibleLength := len(strings.Split(asciiNoColor, "\n")[lineIndex])
+	if len(asciiSplit) < len(strings.Split(string(out), "\n")) {
-		lastAsciiColor := ""
+		y = len(strings.Split(string(out), "\n"))
-		if lineIndex != 0 {
+	}
-			r := regexp.MustCompile("\033[38;5;[0-9]+m")
+	for lineIndex := 0; lineIndex < y; lineIndex++ {
-			matches := r.FindAllString(asciiSplit[lineIndex-1], -1)
+		line := ""
-			if len(matches) != 0 {
+		for i := 0; i < maxWidth+5; i++ {
-				lastAsciiColor = r.FindAllString(asciiSplit[lineIndex-1], -1)[len(matches)-1]
-			}
-		}
-		for i := lineVisibleLength; i < maxWidth+5; i++ {
 			line = line + " "
 		}
-		asciiSplit[lineIndex] = lastAsciiColor + 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"
 	}
-	fmt.Println(final)
+	final = strings.TrimRight(final, "\n\t ")
-}
+	fmt.Println(final + "\033[0m")
-
-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
 }

utils.go

@@ -7,6 +7,7 @@ import (
 	"github.com/BurntSushi/xgb/xinerama"
 	"github.com/jackmordaunt/ghw"
 	"github.com/mitchellh/go-ps"
+	"github.com/moby/sys/mountinfo"
 	"log"
 	"math"
 	"os"
@@ -27,41 +28,32 @@ type DistroInfo struct {
 }
 
 func getDistroInfo() DistroInfo {
-	distroID := ""
+	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)
+	}
 	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{
+			return info
-				ID:        "unknown",
-				LongName:  "Unknown",
-				ShortName: "Unknown",
-			}
-		}
-		if value, ok := releaseMap["ID"]; ok {
-			distroID = value
 		}
 	}
-
+	if id, ok := releaseMap["ID"]; ok {
-	switch distroID {
+		info.ID = id
-	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",
-		}
 	}
+	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 {
@@ -102,7 +94,7 @@ func getDistroAsciiArt() string {
 		if err != nil {
 			return defaultAscii
 		}
-		return string(bytes)
+		return strings.TrimRight(string(bytes), "\n\t ")
 	} else {
 		return defaultAscii
 	}
@@ -127,7 +119,8 @@ func getCPUThreads() int {
 	return int(cpu.TotalThreads)
 }
 
-func getGPUName() string {
+func getGPUNames() []string {
+	var ret []string
 	null, _ := os.Open(os.DevNull)
 	serr := os.Stderr
 	os.Stderr = null
@@ -135,14 +128,17 @@ func getGPUName() string {
 	defer null.Close()
 	os.Stderr = serr
 	if err != nil {
-		return ""
+		return nil
 	}
-	for _, graphics := range gpu.GraphicsCards {
+	for i, graphics := range gpu.GraphicsCards {
+		if slices.Contains(config.HiddenGPUS, i+1) {
+			continue
+		}
 		if graphics.DeviceInfo != nil {
-			return graphics.DeviceInfo.Product.Name
+			ret = append(ret, graphics.DeviceInfo.Product.Name)
 		}
 	}
-	return ""
+	return ret
 }
 
 type Memory struct {
@@ -267,7 +263,6 @@ func GetDEWM() string {
 		}
 		return strings.TrimSpace(string(out))
 	}
-
 	if processExists("plasmashell") {
 		return "KDE Plasma " + runCommand("plasmashell --version | awk '{print $2}'")
 	} else if processExists("gnome-session") {
@@ -324,17 +319,20 @@ type partition struct {
 	Device     string
 	MountPoint string
 	Label      string
+	Type       string
 	TotalSize  uint64
 	UsedSize   uint64
 	FreeSize   uint64
 }
 
 func getMountedPartitions() []partition {
-	partuuids, err := os.ReadDir("/dev/disk/by-partuuid")
+	mounts, err := mountinfo.GetMounts(func(info *mountinfo.Info) (skip, stop bool) {
-	if err != nil {
+		return !strings.HasPrefix(info.Source, "/dev/"), false
+	})
+	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
@@ -347,47 +345,40 @@ func getMountedPartitions() []partition {
 		}
 		labels[link] = entry.Name()
 	}
-
+	for _, entry := range fslabels {
-	bytes, err := os.ReadFile("/proc/mounts")
+		link, err := filepath.EvalSymlinks(filepath.Join("/dev/disk/by-label/", entry.Name()))
-	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 {
+		labels[link] = entry.Name()
+	}
+	var partitions []partition
+	for _, entry := range mounts {
+		p := partition{
+			entry.Source,
+			entry.Mountpoint,
+			"",
+			entry.FSType,
+			0,
+			0,
+			0,
+		}
+		skip := false
+		for _, part := range partitions {
+			if part.Device == p.Device {
+				skip = true
+			}
+		}
+		if skip {
 			continue
 		}
-		p := partition{
+		if value, ok := labels[entry.Source]; ok {
-			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)
+			continue
 		}
 		totalBlocks := buf.Blocks
 		freeBlocks := buf.Bfree