From 0e7af89077964c141ef8978ddfdeaa43baf92265 Mon Sep 17 00:00:00 2001 From: m2Giles <69128853+m2Giles@users.noreply.github.com> Date: Sun, 21 Apr 2024 17:21:29 -0400 Subject: [PATCH 1/7] chore: Kyle flexed --- .../usr/etc/profile.d/aurora-fastfetch.sh | 3 +- .../shared/usr/libexec/ublue-image-info.sh | 9 ++ .../shared/usr/share/ublue-os/ublue-os.jsonc | 101 ++++++++++++++++++ .../usr/etc/profile.d/bluefin-fastfetch.sh | 3 +- 4 files changed, 114 insertions(+), 2 deletions(-) create mode 100755 system_files/shared/usr/libexec/ublue-image-info.sh create mode 100644 system_files/shared/usr/share/ublue-os/ublue-os.jsonc diff --git a/system_files/kinoite/usr/etc/profile.d/aurora-fastfetch.sh b/system_files/kinoite/usr/etc/profile.d/aurora-fastfetch.sh index 6ac9a998e80..b816a6410ce 100644 --- a/system_files/kinoite/usr/etc/profile.d/aurora-fastfetch.sh +++ b/system_files/kinoite/usr/etc/profile.d/aurora-fastfetch.sh @@ -1,3 +1,4 @@ #!/usr/bin/sh -alias fastfetch="/usr/bin/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" +alias fastfetch="/usr/bin/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" +alias neofetch="/usr/bin/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-image-info.sh b/system_files/shared/usr/libexec/ublue-image-info.sh new file mode 100755 index 00000000000..46d5db55cc7 --- /dev/null +++ b/system_files/shared/usr/libexec/ublue-image-info.sh @@ -0,0 +1,9 @@ +#!/usr/bin/bash + +echo -n "$(jq -r '\"\\(.[\"image-name\"]):\\(.[\"image-tag\"])\"' < /usr/share/ublue-os/image-info.json)" + +if [[ $(rpm-ostree status --booted) =~ "signed" ]]; then + echo -n "🔐" +else + echo -n "🔒" +fi \ No newline at end of file diff --git a/system_files/shared/usr/share/ublue-os/ublue-os.jsonc b/system_files/shared/usr/share/ublue-os/ublue-os.jsonc new file mode 100644 index 00000000000..d5a82750e02 --- /dev/null +++ b/system_files/shared/usr/share/ublue-os/ublue-os.jsonc @@ -0,0 +1,101 @@ +{ + "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", + "display": { + "separator": " îȘŸ ", + "color": { + "keys": "bright_blue" + }, + }, + "modules": [ + { + "type": "title", + "key": " ", + "color": { + "user": "bright_blue", + "at": "white", + "host": "blue" + } + }, + "break", + { + "type": "command", + "key": "󱋩", + "text": "/usr/libexec/ublue-image-info.sh" + }, + { + "type": "os", + "key": " 󰣛" + }, + { + "type": "kernel", + "key": " ï…Œ", + "format": "{1} {2}" + }, + { + "type": "uptime", + "key": " 󰅐" + }, + "break", + { + "type": "command", + "key": " ó°Ÿ°", + "text": "cat /sys/devices/virtual/dmi/id/product_name", + "shell": "/bin/bash" + }, + { + "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, + "symbol": "circle" + } + ] +} \ No newline at end of file diff --git a/system_files/silverblue/usr/etc/profile.d/bluefin-fastfetch.sh b/system_files/silverblue/usr/etc/profile.d/bluefin-fastfetch.sh index df21e4279d2..ca5fa15690e 100644 --- a/system_files/silverblue/usr/etc/profile.d/bluefin-fastfetch.sh +++ b/system_files/silverblue/usr/etc/profile.d/bluefin-fastfetch.sh @@ -1,3 +1,4 @@ #!/bin/sh -alias fastfetch="/usr/bin/fastfetch --logo /usr/share/ublue-os/bluefin-logo" \ No newline at end of file +alias fastfetch="/usr/bin/fastfetch --logo /usr/share/ublue-os/bluefin-logo -c /usr/share/ublue-os/ublue-os.jsonc" +alias neofetch="/usr/bin/fastfetch --logo /usr/share/ublue-os/bluefin-logo -c /usr/share/ublue-os/ublue-os.jsonc" \ No newline at end of file From 8f0c5a9f83f02844053e21451b8178132c352cec Mon Sep 17 00:00:00 2001 From: m2Giles <69128853+m2Giles@users.noreply.github.com> Date: Sun, 21 Apr 2024 17:22:42 -0400 Subject: [PATCH 2/7] chore: Kyle Flexed --- .../shared/usr/etc/xdg/fastfetch/config.jsonc | 42 ------------------- .../shared/usr/libexec/get-image-sign.sh | 8 ---- 2 files changed, 50 deletions(-) delete mode 100644 system_files/shared/usr/etc/xdg/fastfetch/config.jsonc delete mode 100755 system_files/shared/usr/libexec/get-image-sign.sh diff --git a/system_files/shared/usr/etc/xdg/fastfetch/config.jsonc b/system_files/shared/usr/etc/xdg/fastfetch/config.jsonc deleted file mode 100644 index c24d4d85464..00000000000 --- a/system_files/shared/usr/etc/xdg/fastfetch/config.jsonc +++ /dev/null @@ -1,42 +0,0 @@ -{ - "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", - "modules": [ - "title", - "separator", - { - "type": "command", - "key": "OCI", - "text": "jq -r '.\"image-name\"' < /usr/share/ublue-os/image-info.json", - }, - { - "type": "command", - "key": "Flavor", - "text": "jq -r '.\"image-flavor\"' < /usr/share/ublue-os/image-info.json", - }, - { - "type": "command", - "key": "Image Tag", - "text": "jq -r '.\"image-tag\"' < /usr/share/ublue-os/image-info.json", - }, - { - "type": "command", - "key": "Signed", - "text": "/usr/libexec/get-image-sign.sh" - }, - "break", - "host", - "kernel", - "uptime", - "break", - "packages", - "shell", - "display", - "terminal", - "break", - "cpu", - "gpu", - "memory", - "break", - "colors" - ] - } \ No newline at end of file diff --git a/system_files/shared/usr/libexec/get-image-sign.sh b/system_files/shared/usr/libexec/get-image-sign.sh deleted file mode 100755 index 99b5ec792a6..00000000000 --- a/system_files/shared/usr/libexec/get-image-sign.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/bash - -IMAGE=$(rpm-ostree status --booted | head -3 | tail -1) -if grep -qv signed <<< "${IMAGE}"; then - echo "🔒 No" -else - echo "🔐 Yes" -fi From 7f00c93c278d1061153d65f5fbca32c788f0c9a1 Mon Sep 17 00:00:00 2001 From: m2Giles <69128853+m2Giles@users.noreply.github.com> Date: Sun, 21 Apr 2024 17:33:34 -0400 Subject: [PATCH 3/7] fix: jq type and flashing lock --- system_files/shared/usr/libexec/ublue-image-info.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system_files/shared/usr/libexec/ublue-image-info.sh b/system_files/shared/usr/libexec/ublue-image-info.sh index 46d5db55cc7..6798f828536 100755 --- a/system_files/shared/usr/libexec/ublue-image-info.sh +++ b/system_files/shared/usr/libexec/ublue-image-info.sh @@ -1,9 +1,9 @@ #!/usr/bin/bash -echo -n "$(jq -r '\"\\(.[\"image-name\"]):\\(.[\"image-tag\"])\"' < /usr/share/ublue-os/image-info.json)" +echo -n $(jq -r '"\(.["image-name"]):\(.["image-tag"])"' < /usr/share/ublue-os/image-info.json) if [[ $(rpm-ostree status --booted) =~ "signed" ]]; then echo -n "🔐" else - echo -n "🔒" + echo -n -e "\033[5m🔒" fi \ No newline at end of file From 51bee614d339984004a3ae0a203462df6fa0d67f Mon Sep 17 00:00:00 2001 From: m2Giles <69128853+m2Giles@users.noreply.github.com> Date: Sun, 21 Apr 2024 17:35:02 -0400 Subject: [PATCH 4/7] fix: a nice space --- system_files/shared/usr/libexec/ublue-image-info.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/system_files/shared/usr/libexec/ublue-image-info.sh b/system_files/shared/usr/libexec/ublue-image-info.sh index 6798f828536..9f617680c79 100755 --- a/system_files/shared/usr/libexec/ublue-image-info.sh +++ b/system_files/shared/usr/libexec/ublue-image-info.sh @@ -3,7 +3,7 @@ echo -n $(jq -r '"\(.["image-name"]):\(.["image-tag"])"' < /usr/share/ublue-os/image-info.json) if [[ $(rpm-ostree status --booted) =~ "signed" ]]; then - echo -n "🔐" + echo -n " 🔐" else - echo -n -e "\033[5m🔒" + echo -n -e " \033[5m🔒" fi \ No newline at end of file From ad3601dda13dc12ef0eb5e9515ea7916cd05f391 Mon Sep 17 00:00:00 2001 From: m2Giles <69128853+m2Giles@users.noreply.github.com> Date: Sun, 21 Apr 2024 17:46:56 -0400 Subject: [PATCH 5/7] chore: turn off blinking following lock --- system_files/shared/usr/libexec/ublue-image-info.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system_files/shared/usr/libexec/ublue-image-info.sh b/system_files/shared/usr/libexec/ublue-image-info.sh index 9f617680c79..864ff6a51a9 100755 --- a/system_files/shared/usr/libexec/ublue-image-info.sh +++ b/system_files/shared/usr/libexec/ublue-image-info.sh @@ -5,5 +5,5 @@ echo -n $(jq -r '"\(.["image-name"]):\(.["image-tag"])"' < /usr/share/ublue-os/i if [[ $(rpm-ostree status --booted) =~ "signed" ]]; then echo -n " 🔐" else - echo -n -e " \033[5m🔒" + echo -n -e " \033[5m🔒\033[0m" fi \ No newline at end of file From 2a1e819bb81f5d0839bcbc93054f75242b8ce4c9 Mon Sep 17 00:00:00 2001 From: m2Giles <69128853+m2Giles@users.noreply.github.com> Date: Sun, 21 Apr 2024 17:48:18 -0400 Subject: [PATCH 6/7] chore: unlock --- system_files/shared/usr/libexec/ublue-image-info.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system_files/shared/usr/libexec/ublue-image-info.sh b/system_files/shared/usr/libexec/ublue-image-info.sh index 864ff6a51a9..956bb836e9d 100755 --- a/system_files/shared/usr/libexec/ublue-image-info.sh +++ b/system_files/shared/usr/libexec/ublue-image-info.sh @@ -5,5 +5,5 @@ echo -n $(jq -r '"\(.["image-name"]):\(.["image-tag"])"' < /usr/share/ublue-os/i if [[ $(rpm-ostree status --booted) =~ "signed" ]]; then echo -n " 🔐" else - echo -n -e " \033[5m🔒\033[0m" + echo -n -e " \033[5m🔓\033[0m" fi \ No newline at end of file From 03a3cd72f88f4e5f9075e0754b4fda382259fef0 Mon Sep 17 00:00:00 2001 From: m2Giles <69128853+m2Giles@users.noreply.github.com> Date: Sun, 21 Apr 2024 18:26:23 -0400 Subject: [PATCH 7/7] chore: change colors, update memory key --- system_files/shared/usr/share/ublue-os/ublue-os.jsonc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/system_files/shared/usr/share/ublue-os/ublue-os.jsonc b/system_files/shared/usr/share/ublue-os/ublue-os.jsonc index d5a82750e02..189f5ccb773 100644 --- a/system_files/shared/usr/share/ublue-os/ublue-os.jsonc +++ b/system_files/shared/usr/share/ublue-os/ublue-os.jsonc @@ -3,7 +3,7 @@ "display": { "separator": " îȘŸ ", "color": { - "keys": "bright_blue" + "keys": "bright_cyan" }, }, "modules": [ @@ -11,9 +11,9 @@ "type": "title", "key": " ", "color": { - "user": "bright_blue", + "user": "cyan", "at": "white", - "host": "blue" + "host": "bright_white" } }, "break", @@ -52,7 +52,7 @@ }, { "type": "memory", - "key": " " + "key": " 󰧑" }, { "type": "disk",