From 46191ba94f7af95f0037e17af83fd8d6bed3511e Mon Sep 17 00:00:00 2001
From: Tulip Blossom <tulilirockz@outlook.com>
Date: Wed, 8 Jan 2025 22:38:55 -0300
Subject: [PATCH] feat: move fastfetch configuraiton to ublue-fastfetch package
 and bluefin-branding

---
 packages.json                                 |   2 +
 system_files/shared/etc/profile.d/neofetch.sh |   3 -
 .../shared/etc/ublue-os/fastfetch.json        |   4 +
 .../shared/usr/libexec/ublue-bling-fastfetch  |  38 -------
 .../share/fish/vendor_conf.d/neofetch.fish    |   4 -
 .../shared/usr/share/ublue-os/ublue-os.jsonc  | 105 ------------------
 6 files changed, 6 insertions(+), 150 deletions(-)
 delete mode 100644 system_files/shared/etc/profile.d/neofetch.sh
 create mode 100644 system_files/shared/etc/ublue-os/fastfetch.json
 delete mode 100755 system_files/shared/usr/libexec/ublue-bling-fastfetch
 delete mode 100644 system_files/shared/usr/share/fish/vendor_conf.d/neofetch.fish
 delete mode 100644 system_files/shared/usr/share/ublue-os/ublue-os.jsonc

diff --git a/packages.json b/packages.json
index 9ab39988f5a..7d0567af2a5 100644
--- a/packages.json
+++ b/packages.json
@@ -8,6 +8,7 @@
 				"bcache-tools",
 				"borgbackup",
 				"bootc",
+				"bluefin-fastfetch",
 				"ddcutil",
 				"evtest",
 				"epson-inkjet-printer-escpr",
@@ -55,6 +56,7 @@
 				"stress-ng",
 				"tailscale",
 				"tmux",
+				"ublue-fastfetch",
 				"usbmuxd",
 				"wireguard-tools",
 				"xprop",
diff --git a/system_files/shared/etc/profile.d/neofetch.sh b/system_files/shared/etc/profile.d/neofetch.sh
deleted file mode 100644
index bfb4fde484e..00000000000
--- a/system_files/shared/etc/profile.d/neofetch.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-alias neofetch=fastfetch
diff --git a/system_files/shared/etc/ublue-os/fastfetch.json b/system_files/shared/etc/ublue-os/fastfetch.json
new file mode 100644
index 00000000000..9c5693763e0
--- /dev/null
+++ b/system_files/shared/etc/ublue-os/fastfetch.json
@@ -0,0 +1,4 @@
+{
+	"logo-directory": "/usr/share/ublue-os/bluefin-logos/symbols",
+	"shuffle-logo": true	
+}
diff --git a/system_files/shared/usr/libexec/ublue-bling-fastfetch b/system_files/shared/usr/libexec/ublue-bling-fastfetch
deleted file mode 100755
index 3a4f9a84dec..00000000000
--- a/system_files/shared/usr/libexec/ublue-bling-fastfetch
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-
-THEME=$(gsettings get org.gnome.desktop.interface accent-color 2>/dev/null || echo "'slate'")
-THEME=${THEME//\'/}
-
-FASTFETCH_COLOR_SET="38;2;53;132;228"
-case $THEME in
-  "blue")
-    FASTFETCH_COLOR_SET="38;2;53;132;228"
-    ;;
-  "green")
-    FASTFETCH_COLOR_SET="38;2;58;148;74"
-    ;;
-  "orange")
-    FASTFETCH_COLOR_SET="38;2;237;91;0"
-    ;;
-  "pink")
-    FASTFETCH_COLOR_SET="38;2;213;97;153"
-    ;;
-  "purple")
-    FASTFETCH_COLOR_SET="38;2;139;62;165"
-    ;;
-  "red")
-    FASTFETCH_COLOR_SET="38;2;230;45;66"
-    ;;
-  "slate")
-    FASTFETCH_COLOR_SET="38;2;111;131;150"
-    ;;
-  "teal")
-    FASTFETCH_COLOR_SET="38;2;33;144;164"
-    ;;
-  "yellow")
-    FASTFETCH_COLOR_SET="38;2;200;136;0"
-    ;;
-esac
-
-echo $FASTFETCH_COLOR_SET
-exit 0
diff --git a/system_files/shared/usr/share/fish/vendor_conf.d/neofetch.fish b/system_files/shared/usr/share/fish/vendor_conf.d/neofetch.fish
deleted file mode 100644
index 99586511c98..00000000000
--- a/system_files/shared/usr/share/fish/vendor_conf.d/neofetch.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/fish
-#shellcheck disable=all
-
-alias neofetch=fastfetch
diff --git a/system_files/shared/usr/share/ublue-os/ublue-os.jsonc b/system_files/shared/usr/share/ublue-os/ublue-os.jsonc
deleted file mode 100644
index e5cb8372a4e..00000000000
--- a/system_files/shared/usr/share/ublue-os/ublue-os.jsonc
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-  "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-  "display": {
-    "separator": "  ",
-    "color": {
-      "keys": "38;2;87;160;198"
-    }
-  },
-  "modules": [
-    {
-      "type": "title",
-      "key": "",
-      "color": {
-        "user": "38;2;87;160;198",
-        "at": "white",
-        "host": "bright_green"
-      }
-    },
-    "break",
-    {
-      "type": "command",
-      "key": "󱋩",
-      "text": "/usr/libexec/ublue-image-info.sh"
-    },
-    {
-      "type": "os",
-      "key": "󰣛",
-      "format": "{pretty-name}"
-    },
-    {
-      "type": "kernel",
-      "key": "",
-      "format": "{1} {2}"
-    },
-    {
-      "type": "uptime",
-      "key": "󰅐"
-    },
-    {
-      "type": "command",
-      "key": "󰔠",
-      "text": "date -d$(ls -alct / --time-style=full-iso|tail -1|awk '{print $6}') +'Forged on %b %d %G'",
-      "shell": "/bin/bash"
-    },
-    "break",
-    {
-      "type": "host",
-      "key": "󰾰"
-    },
-    {
-      "type": "cpu",
-      "key": "󰻠"
-    },
-    {
-      "type": "gpu",
-      "key": "󰍛"
-    },
-    {
-      "type": "memory",
-      "key": "󰧑"
-    },
-    {
-      "type": "disk",
-      "key": ""
-    },
-    {
-      "type": "display",
-      "key": "󰍹"
-    },
-    {
-      "type": "battery",
-      "key": ""
-    },
-    {
-      "type": "gamepad",
-      "key": "󰖺"
-    },
-    "break",
-    {
-      "type": "de",
-      "key": "󰕮"
-    },
-    {
-      "type": "wm",
-      "key": ""
-    },
-    {
-      "type": "shell",
-      "key": ""
-    },
-    {
-      "type": "terminal",
-      "key": ""
-    },
-    {
-      "type": "packages",
-      "key": "󰏖"
-    },
-    "break",
-    {
-      "type": "colors",
-      "paddingLeft": 2
-    }
-  ]
-}