diff --git a/build.sh b/build.sh index 81a57c7..b80fa37 100755 --- a/build.sh +++ b/build.sh @@ -91,6 +91,7 @@ dnf -y --enablerepo copr:copr.fedorainfracloud.org:ublue-os:staging install \ gnome-shell-extension-logo-menu \ uupd \ ublue-motd \ + ublue-fastfetch \ bluefin-* dnf -y --enablerepo copr:copr.fedorainfracloud.org:ublue-os:staging swap centos-logos bluefin-logos diff --git a/system_files/etc/fish/conf.d/bluefin-fastfetch.fish b/system_files/etc/fish/conf.d/bluefin-fastfetch.fish deleted file mode 100644 index ed6cacb..0000000 --- a/system_files/etc/fish/conf.d/bluefin-fastfetch.fish +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/fish -#shellcheck disable=all -function fastfetch - set BLUEFIN_FETCH_LOGO (/usr/bin/find "/usr/share/ublue-os/bluefin-logos/symbols/" -mindepth 1 | /usr/bin/shuf -n 1) - /usr/bin/fastfetch --logo $BLUEFIN_FETCH_LOGO --color (/usr/libexec/ublue-bling-fastfetch) -c "/usr/share/ublue-os/ublue-os.jsonc" -end diff --git a/system_files/etc/profile.d/bluefin-fastfetch.sh b/system_files/etc/profile.d/bluefin-fastfetch.sh deleted file mode 100644 index 44ea97b..0000000 --- a/system_files/etc/profile.d/bluefin-fastfetch.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -BLUEFIN_FETCH_LOGO="$(/usr/bin/find /usr/share/ublue-os/bluefin-logos/symbols/* | /usr/bin/shuf -n 1 )" - -alias fastfetch='/usr/bin/fastfetch --logo ${BLUEFIN_FETCH_LOGO} --color $(/usr/libexec/ublue-bling-fastfetch) -c /usr/share/ublue-os/ublue-os.jsonc' diff --git a/system_files/etc/profile.d/neofetch.sh b/system_files/etc/profile.d/neofetch.sh deleted file mode 100644 index bfb4fde..0000000 --- a/system_files/etc/profile.d/neofetch.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -alias neofetch=fastfetch diff --git a/system_files/etc/profile.d/ublue-motd.sh b/system_files/etc/profile.d/ublue-motd.sh deleted file mode 100644 index 8f556ba..0000000 --- a/system_files/etc/profile.d/ublue-motd.sh +++ /dev/null @@ -1,13 +0,0 @@ -# Prevent doublesourcing -if [ -z "$USERMOTDSOURCED" ]; then - USERMOTDSOURCED="Y" - if test -d "$HOME"; then - if test ! -e "$HOME"/.config/no-show-user-motd; then - if test -x "/usr/libexec/ublue-motd"; then - /usr/libexec/ublue-motd - elif test -s "/etc/user-motd"; then - cat /etc/user-motd - fi - fi - fi -fi diff --git a/system_files/etc/ublue-os/fastfetch.json b/system_files/etc/ublue-os/fastfetch.json new file mode 100644 index 0000000..9c56937 --- /dev/null +++ b/system_files/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/usr/libexec/ublue-bling-fastfetch b/system_files/usr/libexec/ublue-bling-fastfetch deleted file mode 100755 index 3a4f9a8..0000000 --- a/system_files/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/usr/share/fish/vendor_conf.d/neofetch.fish b/system_files/usr/share/fish/vendor_conf.d/neofetch.fish deleted file mode 100644 index 9958651..0000000 --- a/system_files/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/usr/share/fish/vendor_functions.d/fish_greeting.fish b/system_files/usr/share/fish/vendor_functions.d/fish_greeting.fish deleted file mode 100644 index bdc2ba2..0000000 --- a/system_files/usr/share/fish/vendor_functions.d/fish_greeting.fish +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/fish -#shellcheck disable=all - -function fish_greeting - if test -d "$HOME" - if test ! -e "$HOME"/.config/no-show-user-motd - if test -x "/usr/libexec/ublue-motd" - /usr/libexec/ublue-motd - end - end - end - - if set -q fish_private_mode - echo "fish is running in private mode, history will not be persisted." - end -end diff --git a/system_files/usr/share/ublue-os/ublue-os.jsonc b/system_files/usr/share/ublue-os/ublue-os.jsonc deleted file mode 100644 index e5cb837..0000000 --- a/system_files/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 - } - ] -}