Add Enit init system detection

Fixed bug which would cause partitions not to show up if /dev/disk/by-partlabel/ did not exist
Updated fetch_script.sh to use labels if available

.gitignore

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

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 -o build/stormfetch stormfetch
+	$(GO) build -ldflags "-w -X 'main.systemConfigDir=$(SYSCONFDIR)'" -o build/stormfetch stormfetch
 
 install: build/stormfetch config/
 	mkdir -p $(DESTDIR)$(BINDIR)
@@ -29,5 +31,10 @@ compress: build/stormfetch config/
 	tar --owner=root --group=root -czf stormfetch.tar.gz stormfetch
 	rm -r stormfetch
 
+run: build/stormfetch
+	build/stormfetch
+
 clean:
-	rm -r build/
+	rm -r build/
+
+.PHONY: build

README.md

@@ -3,21 +3,24 @@
 ## A simple linux fetch program written in go and bash
 
 ### Developers:
-- [CapCreeperGR ](https://gitlab.com/CapCreeperGR)
+- [EnumDev](https://gitlab.com/EnumDev)
 
 ### Project Information
-Stormfetch is a program that can read your system's information and display it in the terminal along with ascii art of the linux distribution you are running.
+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 and 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
+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.
+
+### How it looks
+![Stormfetch gif](media/stormfetch.gif)
 
 ### Installation Guide
+#### Using a package manager
+- Arch Linux: You may use your favorite AUR manager to install the `stormfetch` package
+#### Building from source
 - Download `go` from your package manager or from the go website
 - Download `make` from your package manager
-- (Optional) Download `xorg-xhost` from your package manager to display DE/WM and monitor information
-- (Optional) Download `xorg-xdpyinfo` from your package manager to display Screen Resolution
-- (Optional) Download `lshw` from your package manager to display GPU information
 - 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/arch

@@ -1,4 +1,5 @@
-                   -`
+#/4;27;4;11
+${C1}                   -`
                   .o+`
                  `ooo/
                 `+oooo:
@@ -7,9 +8,9 @@
              `/:-:++oooo+:
             `/++++/+++++++:
            `/++++++++++++++:
-          `/+++ooooooooooooo/`
+          `/+++o${C2}oooooooo${C1}oooo/`
-         ./ooosssso++osssssso+`
+${C2}         ${C1}./${C2}ooosssso++osssssso${C1}+`
-        .oossssso-````/ossssss+`
+${C2}        .oossssso-````/ossssss+`
        -osssssso.      :ssssssso.
       :osssssss/        osssso+++.
      /ossssssss/        +ssssooo/-

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

@@ -1,16 +1,17 @@
-       _,met$$$$$gg.
+#/1;7;9;15
-    ,g$$$$$$$$$$$$$$$P.
+${C2}       _,met&&&&&gg.
-  ,g$$P"        """Y$$.".
+    ,g&&&&&&&&&&&&&&&P.
- ,$$P'              `$$$.
+  ,g&&P"        """Y&&.".
-',$$P       ,ggs.     `$$b:
+ ,&&P'              `&&&.
-`d$$'     ,$P"'   .    $$$
+',&&P       ,ggs.     `&&b:
- $$P      d$'     ,    $$P
+`d&&'     ,&P"'   ${C1}.${C2}    &&&
- $$:      $$.   -    ,d$$'
+ &&P      d&'     ${C1},${C2}    &&P
- $$;      Y$b._   _,d$P'
+ &&:      &&.   ${C1}-${C2}    ,d&&'
- Y$$.    `.`"Y$$$$P"'
+ &&;      Y&b._   _,d&P'
- `$$b      "-.__
+ Y&&.    ${C1}`.${C2}`"Y&&&&P"'
-  `Y$$
+${C2} `&&b      ${C1}"-.__
-   `Y$$.
+${C2}  `Y&&
-     `$$b.
+   `Y&&.
-       `Y$$b.
+     `&&b.
-          `"Y$b._
+       `Y&&b.
+          `"Y&b._

config/ascii/fedora

@@ -1,19 +1,20 @@
-             .',;::::;,'.
+#/12;7;4;15
+${C1}             .',;::::;,'.
          .';:cccccccccccc:;,.
       .;cccccccccccccccccccccc;.
     .:cccccccccccccccccccccccccc:.
-  .;ccccccccccccc;.:dddl:.;ccccccc;.
+  .;ccccccccccccc;${C2}.:dddl:.${C1};ccccccc;.
- .:ccccccccccccc;OWMKOOXMWd;ccccccc:.
+ .:ccccccccccccc;${C2}OWMKOOXMWd${C1};ccccccc:.
-.:ccccccccccccc;KMMc;cc;xMMc;ccccccc:.
+.:ccccccccccccc;${C2}KMMc${C1};cc;${C2}xMMc${C1};ccccccc:.
-,cccccccccccccc;MMM.;cc;;WW:;cccccccc,
+,cccccccccccccc;${C2}MMM.${C1};cc;${C2};WW:${C1};cccccccc,
-:cccccccccccccc;MMM.;cccccccccccccccc:
+:cccccccccccccc;${C2}MMM.${C1};cccccccccccccccc:
-:ccccccc;oxOOOo;MMM0OOk.;cccccccccccc:
+:ccccccc;${C2}oxOOOo${C1};${C2}MMM0OOk.${C1};cccccccccccc:
-cccccc;0MMKxdd:;MMMkddc.;cccccccccccc;
+cccccc;${C2}0MMKxdd:${C1};${C2}MMMkddc.${C1};cccccccccccc;
-ccccc;XM0';cccc;MMM.;cccccccccccccccc'
+ccccc;${C2}XM0'${C1};cccc;${C2}MMM.${C1};cccccccccccccccc'
-ccccc;MMo;ccccc;MMW.;ccccccccccccccc;
+ccccc;${C2}MMo${C1};ccccc;${C2}MMW.${C1};ccccccccccccccc;
-ccccc;0MNc.ccc.xMMd;ccccccccccccccc;
+ccccc;${C2}0MNc.${C1}ccc${C2}.xMMd${C1};ccccccccccccccc;
-cccccc;dNMWXXXWM0:;cccccccccccccc:,
+cccccc;${C2}dNMWXXXWM0:${C1};cccccccccccccc:,
-cccccccc;.:odl:.;cccccccccccccc:,.
+cccccccc;${C2}.:odl:.${C1};cccccccccccccc:,.
 :cccccccccccccccccccccccccccc:'.
 .:cccccccccccccccccccccc:;,..
   '::cccccccccccccc::;,.

config/ascii/gentoo

@@ -1,18 +1,19 @@
-         -/oyddmdhs+:.
+#/5;7;13;69
-     -odNMMMMMMMMNNmhy+-`
+${C1}         -/oyddmdhs+:.
-   -yNMMMMMMMMMMMNNNmmdhy+-
+     -o${C2}dNMMMMMMMMNNmhy+${C1}-`
- `omMMMMMMMMMMMMNmdmmmmddhhy/`
+   -y${C2}NMMMMMMMMMMMNNNmmdhy${C1}+-
- omMMMMMMMMMMMNhhyyyohmdddhhhdo`
+ `o${C2}mMMMMMMMMMMMMNmdmmmmddhhy${C1}/`
-.ydMMMMMMMMMMdhs++so/smdddhhhhdm+`
+ om${C2}MMMMMMMMMMMN${C1}hhyyyo${C2}hmdddhhhd${C1}o`
- oyhdmNMMMMMMMNdyooydmddddhhhhyhNd.
+.y${C2}dMMMMMMMMMMd${C1}hs++so/s${C2}mdddhhhhdm${C1}+`
-  :oyhhdNNMMMMMMMNNNmmdddhhhhhyymMh
+ oy${C2}hdmNMMMMMMMN${C1}dyooy${C2}dmddddhhhhyhN${C1}d.
-    .:+sydNMMMMMNNNmmmdddhhhhhhmMmy
+  :o${C2}yhhdNNMMMMMMMNNNmmdddhhhhhyym${C1}Mh
-       /mMMMMMMNNNmmmdddhhhhhmMNhs:
+    .:${C2}+sydNMMMMMNNNmmmdddhhhhhhmM${C1}my
-    `oNMMMMMMMNNNmmmddddhhdmMNhs+`
+       /m${C2}MMMMMMNNNmmmdddhhhhhmMNh${C1}s:
-  `sNMMMMMMMMNNNmmmdddddmNMmhs/.
+    `o${C2}NMMMMMMMNNNmmmddddhhdmMNhs${C1}+`
- /NMMMMMMMMNNNNmmmdddmNMNdso:`
+  `s${C2}NMMMMMMMMNNNmmmdddddmNMmhs${C1}/.
-+MMMMMMMNNNNNmmmmdmNMNdso/-
+ /N${C2}MMMMMMMMNNNNmmmdddmNMNdso${C1}:`
-yMMNNNNNNNmmmmmNNMmhs+/-`
++M${C2}MMMMMMNNNNNmmmmdmNMNdso${C1}/-
-/hMMNNNNNNNNMNdhs++/-`
+yM${C2}MNNNNNNNmmmmmNNMmhs+/${C1}-`
-`/ohdmmddhys+++/:.`
+/h${C2}MMNNNNNNNNMNdhs++/${C1}-`
+`/${C2}ohdmmddhys+++/:${C1}.`
   `-//////:--.

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

@@ -1,18 +1,19 @@
-           .;ldkO0000Okdl;.
+#/2;7;10;15
+${C2}           .;ldkO0000Okdl;.
        .;d00xl:^''''''^:ok00d;.
      .d00l'                'o00d.
-   .d0Kd'  Okxol:;,.          :O0d.
+   .d0Kd'${C1}  Okxol:;,.          ${C2}:O0d.
-  .OKKKK0kOKKKKKKKKKKOxo:,      lKO.
+  .OK${C1}KKK0kOKKKKKKKKKKOxo:,      ${C2}lKO.
- ,0KKKKKKKKKKKKKKKK0P^,,,^dx:    ;00,
+ ,0K${C1}KKKKKKKKKKKKKKK0P^${C2},,,${C1}^dx:${C2}    ;00,
-.OKKKKKKKKKKKKKKKKk'.oOPPb.'0k.   cKO.
+.OK${C1}KKKKKKKKKKKKKKKk'${C2}.oOPPb.${C1}'0k.${C2}   cKO.
-:KKKKKKKKKKKKKKKKK: kKx..dd lKd   'OK:
+:KK${C1}KKKKKKKKKKKKKKK: ${C2}kKx..dd ${C1}lKd${C2}   'OK:
-dKKKKKKKKKKKOx0KKKd ^0KKKO' kKKc   dKd
+dKK${C1}KKKKKKKKKOx0KKKd ${C2}^0KKKO' ${C1}kKKc${C2}   dKd
-dKKKKKKKKKKKK;.;oOKx,..^..;kKKK0.  dKd
+dKK${C1}KKKKKKKKKK;.;oOKx,..${C2}^${C1}..;kKKK0.${C2}  dKd
-:KKKKKKKKKKKK0o;...^cdxxOK0O/^^'  .0K:
+:KK${C1}KKKKKKKKKK0o;...^cdxxOK0O/^^'  ${C2}.0K:
- kKKKKKKKKKKKKKKK0x;,,......,;od  lKk
+ kKK${C1}KKKKKKKKKKKKK0x;,,......,;od  ${C2}lKk
- '0KKKKKKKKKKKKKKKKKKKKK00KKOo^  c00'
+ '0K${C1}KKKKKKKKKKKKKKKKKKKK00KKOo^  ${C2}c00'
-  'kKKKOxddxkOO00000Okxoc;''   .dKk'
+  'kK${C1}KKOxddxkOO00000Okxoc;''   ${C2}.dKk'
     l0Ko.                    .c00l'
      'l0Kk:.              .;xK0l'
         'lkK0xl:;,,,,;:ldO0kl'
-            '^:ldxkkkkxdl:^'
+            '^:ldxkkkkxdl:^'

config/ascii/opensuse-tumbleweed

@@ -1,4 +1,5 @@
-                                     ......
+#/2;7;10;15
+${C1}                                     ......
      .,cdxxxoc,.               .:kKMMMNWMMMNk:.
     cKMMN0OOOKWMMXo. ;        ;0MWk:.      .:OMMk.
   ;WMK;.       .lKMMNM,     :NMK,             .OMW;
@@ -10,4 +11,4 @@
  .XM0.           ,OMMK,    OMMMK.              .XMK
    oWMO:.    .;xNMMk,       NNNMKl.          .xWMx
      :ONMMNXMMMKx;          .  ,xNMWKkxllox0NMWk,
-         .....                    .:dOOXXKOxl,
+         .....                    .:dOOXXKOxl,

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,17 +1,15 @@
-                 @@@@@@@@@
+#/27;39;5;12
-              @@@~~~~~~~~~@@
+            ${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,20 +1,21 @@
-            .-/+oossssoo+\-.
+#/1;7;3;15
-        ´:+ssssssssssssssssss+:`
+${C1}            .-/+oossssoo+\-.
+        ':+ssssssssssssssssss+:'
       -+ssssssssssssssssssyyssss+-
-    .ossssssssssssssssssdMMMNysssso.
+    .ossssssssssssssssss${C2}dMMMNy${C1}sssso.
-   /ssssssssssshdmmNNmmyNMMMMhssssss\
+   /sssssssssss${C2}hdmmNNmmyNMMMMh${C1}ssssss\
-  +ssssssssshmydMMMMMMMNddddyssssssss+
+  +sssssssss${C2}hm${C1}yd${C2}MMMMMMMNddddy${C1}ssssssss+
- /sssssssshNMMMyhhyyyyhmNMMMNhssssssss\
+ /ssssssss${C2}hNMMM${C1}yh${C2}hyyyyhmNMMMNh${C1}ssssssss\
-.ssssssssdMMMNhsssssssssshNMMMdssssssss.
+.ssssssss${C2}dMMMNh${C1}ssssssssss${C2}hNMMMd${C1}ssssssss.
-+sssshhhyNMMNyssssssssssssyNMMMysssssss+
++ssss${C2}hhhyNMMNy${C1}ssssssssssss${C2}yNMMMy${C1}sssssss+
-ossyNMMMNyMMhsssssssssssssshmmmhssssssso
+oss${C2}yNMMMNyMMh${C1}ssssssssssssss${C2}hmmmh${C1}ssssssso
-ossyNMMMNyMMhsssssssssssssshmmmhssssssso
+oss${C2}yNMMMNyMMh${C1}sssssssssssssshmmmh${C1}ssssssso
-+sssshhhyNMMNyssssssssssssyNMMMysssssss+
++ssss${C2}hhhyNMMNy${C1}ssssssssssss${C2}yNMMMy${C1}sssssss+
-.ssssssssdMMMNhsssssssssshNMMMdssssssss.
+.ssssssss${C2}dMMMNh${C1}ssssssssss${C2}hNMMMd${C1}ssssssss.
- \sssssssshNMMMyhhyyyyhdNMMMNhssssssss/
+ \ssssssss${C2}hNMMM${C1}yh${C2}hyyyyhdNMMMNh${C1}ssssssss/
-  +sssssssssdmydMMMMMMMMddddyssssssss+
+  +sssssssss${C2}dm${C1}yd${C2}MMMMMMMMddddy${C1}ssssssss+
-   \ssssssssssshdmNNNNmyNMMMMhssssss/
+   \sssssssssss${C2}hdmNNNNmyNMMMMh${C1}ssssss/
-    .ossssssssssssssssssdMMMNysssso.
+    .ossssssssssssssssss${C2}dMMMNy${C1}sssso.
-      -+sssssssssssssssssyyyssss+-
+      -+sssssssssssssssss${C2}yyy${C1}ssss+-
-        `:+ssssssssssssssssss+:`
+        ':+ssssssssssssssssss+:'
-            .-\+oossssoo+/-.
+            .-\+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,3 +1,7 @@
 distro_ascii: auto
 fetch_script: auto
-dependency_warning: true
+ansii_colors: []
+force_config_ansii: false
+dependency_warning: true
+show_fs_type: true
+hidden_gpus: []

config/fetch_script.sh

@@ -1,21 +1,48 @@
 source fetch_script_functions.sh
 
-echo "Distribution: ${DISTRO_LONG_NAME} ($(uname -m))"
+echo -e "${C3}Distribution: ${C4}${DISTRO_LONG_NAME} ($(uname -m))"
-echo "Hostname: $(cat /etc/hostname)"
+echo -e "${C3}Hostname: ${C4}$(cat /etc/hostname)"
-echo "Kernel: $(uname -s) $(uname -r)"
+echo -e "${C3}Kernel: ${C4}$(uname -s) $(uname -r)"
-echo "Packages: $(get_packages)"
+echo -e "${C3}Packages: ${C4}$(get_packages)"
-echo "Shell: $(get_shell)"
+echo -e "${C3}Shell: ${C4}${USER_SHELL}"
-echo "CPU: $(get_cpu_name) ($(nproc) threads)"
+echo -e "${C3}Init: ${C4}${INIT_SYSTEM}"
-if command_exists lshw; then
+echo -e "${C3}Libc: ${C4}${LIBC}"
-  echo "GPU: $(lshw -class display 2> /dev/null | grep 'product' | cut -d":" -f2 | xargs)"
+[ -n "$MOTHERBOARD" ] && echo -e "${C3}Motherboard: ${C4}${MOTHERBOARD}"
-fi
+[ -n "$CPU_MODEL" ] && echo -e "${C3}CPU: ${C4}${CPU_MODEL} (${CPU_THREADS} threads)"
-echo "Memory: $(get_used_mem) MiB / $(get_total_mem) MiB"
+for i in $(seq "${CONNECTED_GPUS}"); do
-if xhost >& /dev/null ; then
+    gpu="GPU$i"
-  if get_de_wm &> /dev/null; then
+    echo -e "${C3}GPU: ${C4}${!gpu}"
-    echo "DE/WM: $(get_de_wm)"
+  done
-  fi
+[ -n "$MEM_TOTAL" ] && [ -n "$MEM_USED" ] && echo -e "${C3}Memory: ${C4}${MEM_USED} MiB / ${MEM_TOTAL} MiB"
-  if command_exists xdpyinfo ; then
+for i in $(seq "${MOUNTED_PARTITIONS}"); do
-    echo "Screen Resolution: $(get_screen_resolution)"
+  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
+  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
+    monitor="MONITOR$i"
+    echo -e "${C3}Screen $i: ${C4}${!monitor}"
+  done
 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

@@ -9,77 +9,6 @@ command_exists() {
     fi
 }
 
-get_shell() {
-    case ${SHELL##*/} in
-    "")
-        echo "Unknown"
-        ;;
-    sh|ash|dash|es)
-        echo "${SHELL##*/} $(${SHELL##*/} --version)"
-        ;;
-    bash)
-        echo "${SHELL##*/} $(${SHELL##*/} -c "echo "'$BASH_VERSION')"
-        ;;
-    *)
-        SHELL_NAME=${SHELL##*/}
-        SHELL_VERSION="$($SHELL --version)"
-        SHELL_VERSION=${SHELL_VERSION//","}
-        SHELL_VERSION=${SHELL_VERSION//" "}
-        SHELL_VERSION=${SHELL_VERSION//"version"}
-        SHELL_VERSION=${SHELL_VERSION//"$SHELL_NAME"}
-        echo "$SHELL_NAME $SHELL_VERSION"
-        unset SHELL_NAME
-        unset SHELL_VERSION
-        ;;
-    esac
-}
-
-get_cpu_name() {
-    grep -m1 "model name" /proc/cpuinfo | cut -d: -f2 | xargs
-}
-
-get_total_mem() {
-     free --mebi -t | grep 'Total' | tr -s ' ' | cut -d" " -f2
-}
-
-get_free_mem() {
-    free --mebi -t | grep 'Total' | tr -s ' ' | cut -d" " -f4
-}
-
-get_used_mem() {
-    free --mebi -t | grep 'Total' | tr -s ' ' | cut -d" " -f3
-}
-
-get_de_wm() {
-    if ps -e | grep "plasmashell" &> /dev/null ; then
-        echo "KDE Plasma $(plasmashell --version | awk '{print $2}')"
-    elif ps -e | grep "gnome-session" &> /dev/null ; then
-        echo "Gnome $(gnome-shell --version | awk '{print $3}')"
-    elif ps -e | grep "xfce4-session" &> /dev/null ; then
-        echo "XFCE $(xfce4-session --version | grep xfce4-session | awk '{print $2}')"
-    elif ps -e | grep "cinnamon" &> /dev/null ; then
-        echo "Cinnamon $(cinnamon --version | awk '{print $2}')"
-    elif ps -e | grep "mate-panel" &> /dev/null ; then
-        echo "Mate $(mate-about --version | awk '{print $4}')"
-    elif ps -e | grep "lxsession" &> /dev/null ; then
-        echo "LXDE"
-    elif ps -e | grep "sway" &> /dev/null ; then
-        echo "Sway $(sway --version | awk '{print $2}')"
-    elif ps -e | grep "icewm-session" &> /dev/null ; then
-        echo "IceWM $(icewm --version | awk '{print $2}' | sed 's/,//g')"
-    elif [ ! -z $DESKTOP_SESSION ]; then
-        echo "$DESKTOP_SESSION"
-    else
-        return 1
-    fi
-}
-
-get_screen_resolution() {
-    if xhost >& /dev/null && command_exists xdpyinfo; then
-        xdpyinfo | grep dimensions | tr -s ' ' | cut -d " " -f3
-    fi
-}
-
 get_packages() {
     ARRAY=()
     if command_exists dpkg; then
@@ -91,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)")
+        ARRAY+=("$(bpm list -c) (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

@@ -2,4 +2,20 @@ module stormfetch
 
 go 1.22
 
-require gopkg.in/yaml.v3 v3.0.1 // indirect
+require (
+	github.com/BurntSushi/xgb v0.0.0-20210121224620-deaf085860bc
+	github.com/jackmordaunt/ghw v1.0.4
+	github.com/mitchellh/go-ps v1.0.0
+	gopkg.in/yaml.v3 v3.0.1
+)
+
+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
+	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

@@ -1,3 +1,30 @@
+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=
+github.com/jackmordaunt/ghw v1.0.4/go.mod h1:4dReYvJ36CoAzIxlEx8du25Qi/YqKYvEGE9QJoRXiK8=
+github.com/jackmordaunt/pcidb v1.0.1 h1:uLLZa6kD5P39r2cwMyJJkxmuHfH9Wq19gYQEbYcB0Z4=
+github.com/jackmordaunt/pcidb v1.0.1/go.mod h1:OMmhrZOZVu2hYXhBDZXddypxwKR/dp4DbIgzCkQDxdQ=
+github.com/jackmordaunt/wmi v1.2.4 h1:/XyuMiKby0qXNQp1j0uU0JqTWLM0QGOVok1Hf5Yagtg=
+github.com/jackmordaunt/wmi v1.2.4/go.mod h1:K/+FH4467Vk2fJXhYQTZzhctkCMMR7PwHqKbnizFySo=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+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=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

main.go

@@ -1,44 +1,62 @@
 package main
 
 import (
+	"flag"
 	"fmt"
-	yaml "gopkg.in/yaml.v3"
+	"gopkg.in/yaml.v3"
 	"log"
 	"os"
 	"os/exec"
 	"path"
+	"regexp"
+	"strconv"
 	"strings"
+	"time"
 )
 
+var systemConfigDir = "/etc/"
+
 var configPath = ""
 var fetchScriptPath = ""
 
-var config = StormfetchConfig{}
+var TimeTaken = false
+
+var config = StormfetchConfig{
+	Ascii:             "auto",
+	FetchScript:       "auto",
+	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"`
-type DistroInfo struct {
-	ID        string
-	LongName  string
-	ShortName string
 }
 
 func main() {
 	readConfig()
+	readFlags()
+	checkDependencies()
+	runStormfetch()
 }
 
 func readConfig() {
 	// Get home directory
-	configDir, _ := os.UserConfigDir()
+	userConfigDir, _ := os.UserConfigDir()
 	// Find valid config directory
-	if _, err := os.Stat(path.Join(configDir, "stormfetch/config.yaml")); err == nil {
+	if _, err := os.Stat(path.Join(userConfigDir, "stormfetch/config.yaml")); err == nil {
-		configPath = path.Join(configDir, "stormfetch/config.yaml")
+		configPath = path.Join(userConfigDir, "stormfetch/config.yaml")
-	} else if _, err := os.Stat("/etc/stormfetch/config.yaml"); err == nil {
+	} else if _, err := os.Stat(path.Join(systemConfigDir, "stormfetch/config.yaml")); err == nil {
-		configPath = "/etc/stormfetch/config.yaml"
+		configPath = path.Join(systemConfigDir, "stormfetch/config.yaml")
 	} else {
 		log.Fatalf("Config file not found: %s", err.Error())
 	}
@@ -61,16 +79,26 @@ func readConfig() {
 			log.Fatalf("Fetch script path points to a directory")
 		}
 	}
-	if _, err := os.Stat(path.Join(configDir, "stormfetch/fetch_script.sh")); err == nil {
+	if _, err := os.Stat(path.Join(userConfigDir, "stormfetch/fetch_script.sh")); err == nil {
-		fetchScriptPath = path.Join(configDir, "stormfetch/fetch_script.sh")
+		fetchScriptPath = path.Join(userConfigDir, "stormfetch/fetch_script.sh")
-	} else if _, err := os.Stat("/etc/stormfetch/fetch_script.sh"); err == nil {
+	} else if _, err := os.Stat(path.Join(systemConfigDir, "stormfetch/fetch_script.sh")); err == nil {
-		fetchScriptPath = "/etc/stormfetch/fetch_script.sh"
+		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 checkDependencies() {
 	// Show Dependency warning if enabled
 	if config.DependencyWarning {
-		dependencies := []string{"lshw", "xhost", "xdpyinfo"}
+		var dependencies []string
 		var missing []string
 		for _, depend := range dependencies {
 			if _, err := os.Stat(path.Join("/usr/bin/", depend)); err != nil {
@@ -85,137 +113,194 @@ func readConfig() {
 			fmt.Println("You can disable this warning through your stormfetch config")
 		}
 	}
+}
+
+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.Println(fmt.Sprintf("Setting '%s' took %d milliseconds", key, end-start))
+		}
+	}
+	setVariable("DISTRO_LONG_NAME", func() string { return getDistroInfo().LongName })
+	setVariable("DISTRO_SHORT_NAME", func() string { return getDistroInfo().ShortName })
+	setVariable("CPU_MODEL", func() string { return getCPUName() })
+	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.Println(fmt.Sprintf("Setting '%s' took %d milliseconds", "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()
+	end = time.Now().UnixMilli()
+	if showTimeTaken {
+		fmt.Println(fmt.Sprintf("Setting '%s' took %d milliseconds", "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.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)
+		}
+	}
+	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.Println(fmt.Sprintf("Setting '%s' took %d milliseconds", "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 := getGPUNames()
+	end = time.Now().UnixMilli()
+	if showTimeTaken {
+		fmt.Println(fmt.Sprintf("Setting '%s' took %d milliseconds", "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 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, "DISTRO_LONG_NAME="+getDistroInfo().LongName)
+	cmd.Env = append(cmd.Env, SetupFetchEnv(TimeTaken)...)
-	cmd.Env = append(cmd.Env, "DISTRO_SHORT_NAME="+getDistroInfo().ShortName)
+	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)
+		log.Fatalf("Error: Could not run fetch script: %s", err)
 	}
 	// Print Distro Information
-	ascii := getDistroAscii()
 	maxWidth := 0
-	for _, line := range strings.Split(ascii, "\n") {
+	for _, line := range strings.Split(asciiNoColor, "\n") {
 		if len(line) > maxWidth {
 			maxWidth = len(line)
 		}
 	}
-	for lineIndex, line := range strings.Split(ascii, "\n") {
+	final := ""
-		for i := len(line); i < maxWidth+5; i++ {
+	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 + " "
 		}
-		if lineIndex < len(strings.Split(string(out), "\n")) {
+		lastAsciiColor := ""
-			line = line + strings.Split(string(out), "\n")[lineIndex]
+		if lineIndex < len(asciiSplit) {
-		}
+			line = asciiSplit[lineIndex]
-		fmt.Println(line)
+			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)
-func readKeyValueFile(filepath string) (map[string]string, error) {
+				if len(matches) != 0 {
-	ret := make(map[string]string)
+					lastAsciiColor = r.FindAllString(asciiSplit[lineIndex-1], -1)[len(matches)-1]
-	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
-}
-
-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,
-					}
 				}
 			}
-		}
+			for i := lineVisibleLength; i < maxWidth+5; i++ {
-		return DistroInfo{
+				line = line + " "
-			ID:        "unknown",
-			LongName:  "Unknown",
-			ShortName: "Unknown",
-		}
-	}
-}
-
-func getDistroAscii() 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)
+			asciiSplit[lineIndex] = lastAsciiColor + line
-		} else {
-			return defaultAscii
 		}
+		str := string(out)
+		if lineIndex < len(strings.Split(str, "\n")) {
+			line = line + colorMap["C0"] + strings.Split(str, "\n")[lineIndex]
+		}
+		final += lastAsciiColor + line + "\n"
 	}
-	if _, err := os.Stat(path.Join(userConfDir, "stormfetch/ascii/", id)); err == nil {
+	final = strings.TrimRight(final, "\n\t ")
-		bytes, err := os.ReadFile(path.Join(userConfDir, "stormfetch/ascii/", id))
+	fmt.Println(final + "\033[0m")
-		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
-	}
 }

utils.go

@@ -0,0 +1,525 @@
+package main
+
+import (
+	"bufio"
+	"fmt"
+	"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"
+	"path/filepath"
+	"regexp"
+	"slices"
+	"strconv"
+	"strings"
+	"syscall"
+)
+
+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)
+	}
+	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 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 getMotherboardModel() string {
+	bytes, err := os.ReadFile("/sys/devices/virtual/dmi/id/board_name")
+	if err != nil {
+		return ""
+	}
+	return strings.TrimSpace(string(bytes))
+}
+
+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 getGPUNames() []string {
+	var ret []string
+	cmd := exec.Command("/bin/bash", "-c", "lspci -v -m | grep 'VGA' -A6 | grep '^Device:' | sed 's/^Device://' | awk '{$1=$1};1'")
+	bytes, err := cmd.Output()
+	if err != nil {
+		return nil
+	}
+	for _, name := range strings.Split(string(bytes), "\n") {
+		name = strings.TrimSpace(name)
+		if name == "" {
+			continue
+		}
+		ret = append(ret, name)
+	}
+	return ret
+}
+
+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}'")
+	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") {
+		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 ""
+}
+
+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
+}
+
+type partition struct {
+	Device     string
+	MountPoint string
+	Label      string
+	Type       string
+	TotalSize  uint64
+	UsedSize   uint64
+	FreeSize   uint64
+}
+
+func getMountedPartitions() []partition {
+	mounts, err := mountinfo.GetMounts(func(info *mountinfo.Info) (skip, stop bool) {
+		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
+	}
+	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()
+	}
+	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
+		}
+		if value, ok := labels[entry.Source]; ok {
+			p.Label = value
+		}
+		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
+}
+
+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 {
+	cmd := exec.Command("/bin/bash", "-c", "find /usr/lib64/ -maxdepth 1 -name 'ld-*' | grep musl")
+	if err := cmd.Run(); err != nil {
+		cmd = exec.Command("/bin/bash", "-c", "ldd --version | head -1 | cut -d' ' -f4")
+		bytes, err := cmd.Output()
+		if err != nil {
+			return "Glibc"
+		}
+		return "Glibc " + strings.TrimSpace(string(bytes))
+	}
+	cmd = exec.Command("/bin/bash", "-c", "ldd 2>&1 | grep 'Version' | cut -d' ' -f2")
+	bytes, err := cmd.Output()
+	if err != nil {
+		return "Musl"
+	}
+	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"
+	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
+}