diff --git a/packages.json b/packages.json index 7e94471b..7326c2d4 100644 --- a/packages.json +++ b/packages.json @@ -60,6 +60,7 @@ "tmux", "usbmuxd", "ublue-bling", + "ublue-fastfetch", "wireguard-tools", "xprop", "wl-clipboard", diff --git a/system_files/kinoite/etc/profile.d/aurora-fastfetch.sh b/system_files/kinoite/etc/profile.d/aurora-fastfetch.sh deleted file mode 100644 index 86407cc9..00000000 --- a/system_files/kinoite/etc/profile.d/aurora-fastfetch.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/sh - -alias fastfetch='/usr/bin/fastfetch --color $(/usr/libexec/ublue-bling-fastfetch) --file /usr/share/ublue-os/aurora-logo.txt --logo-type file --logo-color-1 94 --logo-color-2 95 --logo-color-3 91 --logo-color-4 97 -c /usr/share/ublue-os/ublue-os.jsonc' diff --git a/system_files/kinoite/usr/share/fish/vendor_conf.d/aurora-fastfetch.fish b/system_files/kinoite/usr/share/fish/vendor_conf.d/aurora-fastfetch.fish deleted file mode 100644 index 5212840f..00000000 --- a/system_files/kinoite/usr/share/fish/vendor_conf.d/aurora-fastfetch.fish +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/fish -#shellcheck disable=all -alias fastfetch='/usr/bin/fastfetch --color (/usr/libexec/ublue-bling-fastfetch) --file /usr/share/ublue-os/aurora-logo.txt --logo-type file --logo-color-1 94 --logo-color-2 95 --logo-color-3 91 --logo-color-4 97 -c /usr/share/ublue-os/ublue-os.jsonc' 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 c00e5f42..00000000 --- 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 || 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/ublue-os/ublue-os.jsonc b/system_files/shared/usr/share/ublue-os/fastfetch.jsonc similarity index 90% rename from system_files/shared/usr/share/ublue-os/ublue-os.jsonc rename to system_files/shared/usr/share/ublue-os/fastfetch.jsonc index e5cb8372..aa39d48d 100644 --- a/system_files/shared/usr/share/ublue-os/ublue-os.jsonc +++ b/system_files/shared/usr/share/ublue-os/fastfetch.jsonc @@ -1,5 +1,15 @@ { "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", + "logo": { + "type": "file", + "source": "/usr/share/ublue-os/aurora-logo.txt", + "color": { + "1": "94", + "2": "95", + "3": "91", + "4": "97", + } + }, "display": { "separator": "  ", "color": {