From f85fdc6148f1881eb20757a78c0e3f4f68c2f9ca Mon Sep 17 00:00:00 2001
From: Kyle Gospodnetich <me@kylegospodneti.ch>
Date: Thu, 30 May 2024 22:38:17 -0700
Subject: [PATCH] chore: Clean up fastfetch config. Thanks @CarterLi

---
 .../usr/etc/profile.d/bazzite-neofetch.sh     |  8 +++----
 .../share/ublue-os/bazzite/fastfetch.jsonc    | 21 ++++++++++++-------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/system_files/desktop/shared/usr/etc/profile.d/bazzite-neofetch.sh b/system_files/desktop/shared/usr/etc/profile.d/bazzite-neofetch.sh
index f83b6b03..7496a7a9 100755
--- a/system_files/desktop/shared/usr/etc/profile.d/bazzite-neofetch.sh
+++ b/system_files/desktop/shared/usr/etc/profile.d/bazzite-neofetch.sh
@@ -1,4 +1,4 @@
-alias neofetch='/usr/bin/fastfetch -c /usr/share/ublue-os/bazzite/fastfetch.jsonc --logo-color-1 94 --logo-color-2 47 --logo-color-3 95 --logo-color-4 0 --logo-color-5 8 --logo-color-6 55'
-alias neowofetch='/usr/bin/fastfetch -c /usr/share/ublue-os/bazzite/fastfetch.jsonc --logo-color-1 94 --logo-color-2 47 --logo-color-3 95 --logo-color-4 0 --logo-color-5 8 --logo-color-6 55'
-alias hyfetch='/usr/bin/fastfetch -c /usr/share/ublue-os/bazzite/fastfetch.jsonc --logo-color-1 94 --logo-color-2 47 --logo-color-3 95 --logo-color-4 0 --logo-color-5 8 --logo-color-6 55'
-alias fastfetch='/usr/bin/fastfetch -c /usr/share/ublue-os/bazzite/fastfetch.jsonc --logo-color-1 94 --logo-color-2 47 --logo-color-3 95 --logo-color-4 0 --logo-color-5 8 --logo-color-6 55'
+alias neofetch='/usr/bin/fastfetch -c /usr/share/ublue-os/bazzite/fastfetch.jsonc'
+alias neowofetch='/usr/bin/fastfetch -c /usr/share/ublue-os/bazzite/fastfetch.jsonc'
+alias hyfetch='/usr/bin/fastfetch -c /usr/share/ublue-os/bazzite/fastfetch.jsonc'
+alias fastfetch='/usr/bin/fastfetch -c /usr/share/ublue-os/bazzite/fastfetch.jsonc'
diff --git a/system_files/desktop/shared/usr/share/ublue-os/bazzite/fastfetch.jsonc b/system_files/desktop/shared/usr/share/ublue-os/bazzite/fastfetch.jsonc
index 66dac3dd..84ca7de6 100644
--- a/system_files/desktop/shared/usr/share/ublue-os/bazzite/fastfetch.jsonc
+++ b/system_files/desktop/shared/usr/share/ublue-os/bazzite/fastfetch.jsonc
@@ -2,7 +2,15 @@
     "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
     "logo": {
         "type": "file",
-        "source": "/usr/share/ublue-os/bazzite/logo.txt"
+        "source": "/usr/share/ublue-os/bazzite/logo.txt",
+        "color": {
+            "1": "94",
+            "2": "47",
+            "3": "95",
+            "4": "0",
+            "5": "8",
+            "6": "55"
+        }
     },
     "display": {
         "separator": "  ",
@@ -24,8 +32,7 @@
         {
             "type": "command",
             "key": " 󱋩",
-            "text": "/usr/libexec/bazzite-fetch-image",
-            "shell": "/bin/bash"
+            "text": "/usr/libexec/bazzite-fetch-image"
         },
         {
             "type": "os",
@@ -44,14 +51,12 @@
             "type": "command",
             "key": " 󰔠",
             "text": "date -d$(ls -alct / --time-style=full-iso|tail -1|awk '{print $6}') +'Spawned on %b %d %G'",
-            "shell": "/bin/bash"
+            "shell": "/usr/bin/bash"
         },
         "break",
         {
-            "type": "command",
-            "key": " 󰾰",
-            "text": "cat /sys/devices/virtual/dmi/id/product_name",
-            "shell": "/bin/bash"
+            "type": "host",
+            "key": " 󰾰"
         },
         {
             "type": "cpu",