mirror/bazzite
1
0
Fork 0
mirror of https://github.com/ublue-os/bazzite.git synced 2025-02-20 15:40:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Switch to fastfetch from hyfetch

Browse Source 
chore(KDE): use newer extension installer
This commit is contained in:
Kyle Gospodnetich 2024-04-21 10:49:04 -07:00
parent eda1f2a3ab
commit 8c921a5780
8 changed files with 143 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Containerfile
View File

@ -317,6 +317,7 @@ RUN rpm-ostree install \
lato-fonts \
fira-code-fonts \
nerd-fonts \
fastfetch \
glow \
gum \
vim \
@ -463,7 +464,7 @@ RUN if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
curl -Lo /tmp/kwin-system76-scheduler-integration/archive.tar.gz https://github.com/maxiberta/kwin-system76-scheduler-integration/archive/refs/heads/main.tar.gz && \
tar --no-same-owner --no-same-permissions --no-overwrite-dir --strip-components 1 -xvf /tmp/kwin-system76-scheduler-integration/archive.tar.gz -C /tmp/kwin-system76-scheduler-integration && \
git clone https://github.com/catsout/wallpaper-engine-kde-plugin.git --depth 1 /tmp/wallpaper-engine-kde-plugin && \
kpackagetool5 --type=KWin/Script --global --install /tmp/kwin-system76-scheduler-integration && \
kpackagetool6 --type=KWin/Script --global --install /tmp/kwin-system76-scheduler-integration && \
kpackagetool5 --type=Plasma/Wallpaper --global --install /tmp/wallpaper-engine-kde-plugin/plugin && \
rm -rf /tmp/kwin-system76-scheduler-integration && \
rm -rf /tmp/wallpaper-engine-kde-plugin && \
@ -563,7 +564,6 @@ RUN /usr/libexec/containerbuild/build-initramfs && \
echo "import \"/usr/share/ublue-os/just/85-bazzite-image.just\"" >> /usr/share/ublue-os/justfile && \
echo "import \"/usr/share/ublue-os/just/90-bazzite-de.just\"" >> /usr/share/ublue-os/justfile && \
pip install --prefix=/usr yafti && \
pip install --prefix=/usr hyfetch && \
sed -i 's/stage/none/g' /etc/rpm-ostreed.conf && \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_sentry-kernel-fsync.repo && \
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \

6
system_files/desktop/shared/usr/etc/profile.d/bazzite-neofetch.sh
View File

@ -1,3 +1,3 @@
alias neofetch='/usr/bin/neowofetch --source /usr/share/ublue-os/bazzite/logo.txt --ascii_colors 12 7 13 --config /usr/share/ublue-os/bazzite/neofetch.conf --package_separate off'
alias neowofetch='/usr/bin/neowofetch --source /usr/share/ublue-os/bazzite/logo.txt --ascii_colors 12 7 13 --config /usr/share/ublue-os/bazzite/neofetch.conf --package_separate off'
alias hyfetch='/usr/bin/hyfetch --ascii-file /usr/share/ublue-os/bazzite/logo.txt'
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'

8
system_files/desktop/shared/usr/libexec/bazzite-fetch-image Executable file
View File

@ -0,0 +1,8 @@
#!/usr/bin/bash
echo -n $(jq -r '"\(.["image-name"]):\(.["image-branch"])"' < /usr/share/ublue-os/image-info.json)
if [[ "$(rpm-ostree status --json --booted)" =~ "ostree-image-signed" ]]; then
echo -n " "
else
echo -n " "
fi

6
system_files/desktop/shared/usr/libexec/ublue-motd
View File

@ -8,8 +8,8 @@ if [[ -f "$TIP_FILE" ]]; then
IMAGE_INFO="/usr/share/ublue-os/image-info.json"
IMAGE_NAME=$(jq -r '."image-name"' < $IMAGE_INFO)
IMAGE_NAME_ESCAPED=$(escape "$IMAGE_NAME")
IMAGE_TAG=$(jq -r '."image-tag"' < $IMAGE_INFO)
IMAGE_TAG_ESCAPED=$(escape "$IMAGE_TAG")
IMAGE_BRANCH=$(jq -r '."image-branch"' < $IMAGE_INFO)
IMAGE_BRANCH_ESCAPED=$(escape "$IMAGE_BRANCH")
TIP="󰋼 $(shuf -n 1 "$TIP_FILE")"
IMAGE_DATE=$(rpm-ostree status --booted | sed -n 's/.*Timestamp: \(.*\)/\1/p')
@ -23,5 +23,5 @@ if [[ -f "$TIP_FILE" ]]; then
TIP_ESCAPED=$(escape "$TIP")
sed -e "s/%IMAGE_NAME%/$IMAGE_NAME_ESCAPED/g" -e "s/%IMAGE_TAG%/$IMAGE_TAG_ESCAPED/g" -e "s/%TIP%/$TIP_ESCAPED/g" /usr/share/ublue-os/motd/bazzite.md | tr '~' '\n' | /usr/bin/glow -s auto -
sed -e "s/%IMAGE_NAME%/$IMAGE_NAME_ESCAPED/g" -e "s/%IMAGE_BRANCH%/$IMAGE_BRANCH_ESCAPED/g" -e "s/%TIP%/$TIP_ESCAPED/g" /usr/share/ublue-os/motd/bazzite.md | tr '~' '\n' | /usr/bin/glow -s auto -
fi

111
system_files/desktop/shared/usr/share/ublue-os/bazzite/fastfetch.jsonc Normal file
View File

@ -0,0 +1,111 @@
{
"$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
"logo": {
"type": "file",
"source": "/usr/share/ublue-os/bazzite/logo.txt",
"color": {
"1": "light_blue",
"2": "white",
"3": "magenta"
}
},
"display": {
"separator": "  ",
"color": {
"keys": "light_blue"
},
},
"modules": [
{
"type": "title",
"key": " ",
"color": {
"user": "light_blue",
"at": "white",
"host": "magenta"
}
},
"break",
{
"type": "command",
"key": " 󱋩",
"text": "/usr/libexec/bazzite-fetch-image",
"shell": "/bin/bash"
},
{
"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"
}
]
}

28
system_files/desktop/shared/usr/share/ublue-os/bazzite/logo.txt
View File

@ -1,20 +1,20 @@
${c1}
$1
.................
.;;;;;;;;;;;;;;;;;;;;;;;.
,;;;;;;;; ;;;;;;;;;;;;;;;.
.;;;;;;;;; ${c2}▲${c1} ;;;;;;;;;;;;;;;;;;
';;;;;;;;; ;;;;;;;;;;;;;;;;;:;
,;;;;;;;; ;;;;;;;;;;;;;;.
.;;;;;;;;; $2$1 ;;;;;;;;;;;;;;;;;
';;;;;;;;; ;;;;;;;;;;;;;;;;:;
';; ;; .;;;;;;;:
';; ${c2}◄${c1} ${c2}►${c1} ;; .;;;${c3};;'${c1}
';; ;; ${c3}.;;;;;${c1}
';;;;;;;;; ;;;;;;;;;;;;${c3}, ,;;;;.${c1}
';;;;;;;;; ${c2}▼${c1} ;;;;;;;;;;${c3};;. ;;;;;,${c1}
.;;;;;;;;; ;;;;;;;${c3};;;;' ,;;;;;.${c1}
';;;;;;;;;;;;;;;;;;${c3};;;;;. ;;;;;,${c1}
.;;;;;;;; ;;;${c3};;;;;. .;;;;;;.${c1}
.;;;;;;;; ${c3};;;;;;;.${c1}
;;;;;;;; ${c3}.;;;;;;;;${c1}
.;;;;${c3};;;;; ;;;;:;;;;;;.
';; $2$1 $2$1 ;; .;;;$3;;'$1
';; ;; $3.;;;;;$1
';;;;;;;;; ;;;;;;;;;;;$3, ,;;;;.$1
';;;;;;;;; $2$1 ;;;;;;;;;$3;;. ;;;;;,$1
.;;;;;;;;; ;;;;;;$3;;;;' ,;;;;;.$1
';;;;;;;;;;;;;;;;;;$3;;;;;. ;;;;;,$1
.;;;;;;;; ;;$3;;;;;. .;;;;;;.$1
.;;;;;;;; $3;;;;;;;.$1
;;;;;;;; $3.;;;;;;;;$1
.;;;;$3;;;;; ;;;;:;;;;;;.
;;;;;;;;;;;;;;;;;;;;;;
.;;;;;;;;;;;;;;.

42
system_files/desktop/shared/usr/share/ublue-os/bazzite/neofetch.conf
View File

@ -1,42 +0,0 @@
print_info () {
info title
info underline
oci="Bazzite (Desktop Edition) x86_64"
info "Host" model
info "OCI" oci
info "OS" distro
info "Kernel" kernel
info "Uptime" uptime
info "Packages" packages
info "Shell" shell
info "Resolution" resolution
info "DE" de
info "WM" wm
info "WM Theme" wm_theme
info "Theme" theme
info "Icons" icons
info "Terminal" term
info "Terminal Font" term_font
info "CPU" cpu
info "GPU" gpu
info "Memory" memory
# The lines below with a '#' in front are additional info functions
# that are disabled by default. Removing the '#' enables them and adding
# a '#' to the start disables them again. You can add a '#' to any of the
# lines in this function to disable their output.
# info "CPU Usage" cpu_usage
# info "Disk" disk
# info "Battery" battery
# info "Font" font
# info "Song" song
# info "Local IP" local_ip
# info "Public IP" public_ip
# info "Users" users
# info "Birthday" birthday
info cols
}

4
system_files/desktop/shared/usr/share/ublue-os/motd/bazzite.md
View File

@ -1,11 +1,11 @@
# Welcome to Bazzite 󰊴
󱋩 `%IMAGE_NAME%:%IMAGE_TAG%`
󱋩 `%IMAGE_NAME%:%IMAGE_BRANCH%`
|  Command | Description |
| ------- | ----------- |
| `ujust` | List all available commands |
| `ujust toggle-user-motd` | Toggle this banner on/off |
| `neofetch` | View system information |
| `fastfetch` | View system information |
%TIP%
- [ Report an issue](https://github.com/ublue-os/bazzite/issues)