mirror/bazzite
1
0
Fork 0
mirror of https://github.com/ublue-os/bazzite.git synced 2025-03-28 08:37:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Use Bazzite image identifiers instead of rpm-ostree status

Browse Source 
This should be a lot more reliable and consistent
This commit is contained in:
RJ Trujillo 2023-08-04 09:22:25 -06:00
parent 52d28f41f3
commit 586d10e84f
5 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml
View File

@ -242,7 +242,7 @@ screens:
values:
title: Enabling Wallpaper Engine
condition:
run: grep -v "gnome" <<< $(rpm-ostree status)
run: grep -v "gnome" <<< $(cat /etc/default/bazzite)
description: |
Enables the plugin for Wallpaper Engine, a utility that allows you to use live wallpapers on your desktop
actions:
@ -252,7 +252,7 @@ screens:
values:
title: Setting up Gradience
condition:
run: grep "gnome" <<< $(rpm-ostree status)
run: grep "gnome" <<< $(cat /etc/default/bazzite)
description: |
Adds Valve-inspired themes to Gradience
actions:
@ -262,7 +262,7 @@ screens:
values:
title: "GNOME Theme"
condition:
run: grep "gnome" <<< $(rpm-ostree status)
run: grep "gnome" <<< $(cat /etc/default/bazzite)
links:
- "Vapor Theme":
run: just --unstable enable-vapor-theme

16
system_files/deck/shared/usr/share/ublue-os/just/custom.just
View File

@ -1,6 +1,6 @@
enable-gamescope-autologin:
#!/usr/bin/env bash
if grep "gnome" <<< $(rpm-ostree status); then
if grep "gnome" <<< $(cat /etc/default/bazzite); then
systemctl disable --now gnome-autologin
else
systemctl disable --now plasma-autologin
@ -10,7 +10,7 @@ enable-gamescope-autologin:
enable-desktop-autologin:
#!/usr/bin/env bash
systemctl disable --now gamescope-autologin
if grep "gnome" <<< $(rpm-ostree status); then
if grep "gnome" <<< $(cat /etc/default/bazzite); then
systemctl enable --now gnome-autologin
else
systemctl enable --now plasma-autologin
@ -44,7 +44,7 @@ get-steamcmd:
install-extensions-cli:
#!/usr/bin/env bash
if grep "gnome" <<< $(rpm-ostree status); then
if grep "gnome" <<< $(cat /etc/default/bazzite); then
pip install --upgrade gnome-extensions-cli
else
echo "This is only supported under GNOME."
@ -52,7 +52,7 @@ install-extensions-cli:
enable-system76-scheduler:
#!/usr/bin/env bash
if grep -v "gnome" <<< $(rpm-ostree status); then
if grep -v "gnome" <<< $(cat /etc/default/bazzite); then
echo 'Installing System76-Scheduler plugin for KDE...'
git clone https://github.com/maxiberta/kwin-system76-scheduler-integration.git --depth 1 /tmp/kwin-system76-scheduler-integration
kpackagetool5 --type=KWin/Script -i /tmp/kwin-system76-scheduler-integration
@ -86,7 +86,7 @@ get-boilr:
enable-wallpaper-engine:
#!/usr/bin/env bash
if grep -v "gnome" <<< $(rpm-ostree status); then
if grep -v "gnome" <<< $(cat /etc/default/bazzite); then
echo 'Installing Wallpaper Engine Plugin for KDE...'
git clone https://github.com/catsout/wallpaper-engine-kde-plugin.git --depth 1 /tmp/wallpaper-engine-kde-plugin
plasmapkg2 -i /tmp/wallpaper-engine-kde-plugin/plugin
@ -97,7 +97,7 @@ enable-wallpaper-engine:
setup-gradience:
#!/usr/bin/env bash
if grep "gnome" <<< $(rpm-ostree status); then
if grep "gnome" <<< $(cat /etc/default/bazzite); then
gradience-cli import -p /usr/share/ublue-os/bazzite/themes/vapor.json
gradience-cli import -p /usr/share/ublue-os/bazzite/themes/vgui2.json
else
@ -106,7 +106,7 @@ setup-gradience:
enable-vapor-theme:
#!/usr/bin/env bash
if grep "gnome" <<< $(rpm-ostree status); then
if grep "gnome" <<< $(cat /etc/default/bazzite); then
gsettings set org.gnome.desktop.wm.preferences button-layout appmenu:minimize,maximize,close
gsettings set org.gnome.desktop.interface color-scheme prefer-dark
gsettings set org.gnome.desktop.interface gtk-theme adw-gtk3-dark
@ -120,7 +120,7 @@ enable-vapor-theme:
enable-vgui2-theme:
#!/usr/bin/env bash
if grep "gnome" <<< $(rpm-ostree status); then
if grep "gnome" <<< $(cat /etc/default/bazzite); then
gsettings set org.gnome.desktop.wm.preferences button-layout appmenu:minimize,maximize,close
gsettings set org.gnome.desktop.interface color-scheme prefer-dark
gsettings set org.gnome.desktop.interface gtk-theme adw-gtk3-dark

2
system_files/desktop/shared/usr/bin/ublue-flatpak-system-install
View File

@ -15,7 +15,7 @@ if [[ -f '/etc/flatpak/remove' ]]; then
fi
if [[ -f '/etc/flatpak/deck' ]]; then
if grep "deck" <<< $(rpm-ostree status); then
if grep "deck" <<< $(cat /etc/default/bazzite); then
cat /etc/flatpak/deck | while read line; do
flatpak install --system --noninteractive --no-pull flathub $line
done && cat /etc/flatpak/deck >> /etc/flatpak/installed

12
system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml
View File

@ -93,14 +93,14 @@ screens:
values:
title: AMD Additions
condition:
run: grep -v "nvidia" <<< $(rpm-ostree status)
run: grep -v "nvidia" <<< $(cat /etc/default/bazzite)
show_terminal: true
package_manager: yafti.plugin.run
groups:
CoreCtrl:
description: AMD GPU Overclocking
condition:
run: grep -v "nvidia" <<< $(rpm-ostree status)
run: grep -v "nvidia" <<< $(cat /etc/default/bazzite)
default: false
packages:
- Install CoreCtrl: just --unstable install-corectrl
@ -109,7 +109,7 @@ screens:
values:
title: Nvidia Additions
condition:
run: grep "nvidia" <<< $(rpm-ostree status)
run: grep "nvidia" <<< $(cat /etc/default/bazzite)
show_terminal: true
package_manager: yafti.plugin.run
groups:
@ -263,7 +263,7 @@ screens:
values:
title: Enabling Wallpaper Engine
condition:
run: grep -v "gnome" <<< $(rpm-ostree status)
run: grep -v "gnome" <<< $(cat /etc/default/bazzite)
description: |
Enables the plugin for Wallpaper Engine, a utility that allows you to use live wallpapers on your desktop
actions:
@ -273,7 +273,7 @@ screens:
values:
title: Setting up Gradience
condition:
run: grep "gnome" <<< $(rpm-ostree status)
run: grep "gnome" <<< $(cat /etc/default/bazzite)
description: |
Adds Valve-inspired themes to Gradience
actions:
@ -283,7 +283,7 @@ screens:
values:
title: "GNOME Theme"
condition:
run: grep "gnome" <<< $(rpm-ostree status)
run: grep "gnome" <<< $(cat /etc/default/bazzite)
links:
- "Vapor Theme":
run: just --unstable enable-vapor-theme

17
system_files/desktop/shared/usr/share/ublue-os/just/custom.just
View File

@ -28,7 +28,7 @@ remove-nix:
enable-big-picture:
#!/usr/bin/env bash
if grep "gnome" <<< $(rpm-ostree status); then
if grep "gnome" <<< $(cat /etc/default/bazzite); then
systemctl enable --now gnome-autologin
else
systemctl enable --now plasma-autologin
@ -43,7 +43,7 @@ get-greenlight:
install-extensions-cli:
#!/usr/bin/env bash
if grep "gnome" <<< $(rpm-ostree status); then
if grep "gnome" <<< $(cat /etc/default/bazzite); then
pip install --upgrade gnome-extensions-cli
else
echo "This is only supported under GNOME."
@ -51,7 +51,7 @@ install-extensions-cli:
enable-system76-scheduler:
#!/usr/bin/env bash
if grep -v "gnome" <<< $(rpm-ostree status); then
if grep -v "gnome" <<< $(cat /etc/default/bazzite); then
echo 'Installing System76-Scheduler plugin for KDE...'
git clone https://github.com/maxiberta/kwin-system76-scheduler-integration.git --depth 1 /tmp/kwin-system76-scheduler-integration
kpackagetool5 --type=KWin/Script -i /tmp/kwin-system76-scheduler-integration
@ -67,8 +67,7 @@ enable-system76-scheduler:
enable-supergfxctl:
#!/usr/bin/env bash
status=$(rpm-ostree status)
if grep "nvidia" <<< ${status}; then
if grep "nvidia" <<< $(cat /etc/default/bazzite); then
systemctl enable --now supergfxd.service
else
echo "This requires an Nvidia image."
@ -76,7 +75,7 @@ enable-supergfxctl:
enable-wallpaper-engine:
#!/usr/bin/env bash
if grep -v "gnome" <<< $(rpm-ostree status); then
if grep -v "gnome" <<< $(cat /etc/default/bazzite); then
echo 'Installing Wallpaper Engine Plugin for KDE...'
git clone https://github.com/catsout/wallpaper-engine-kde-plugin.git --depth 1 /tmp/wallpaper-engine-kde-plugin
plasmapkg2 -i /tmp/wallpaper-engine-kde-plugin/plugin
@ -87,7 +86,7 @@ enable-wallpaper-engine:
setup-gradience:
#!/usr/bin/env bash
if grep "gnome" <<< $(rpm-ostree status); then
if grep "gnome" <<< $(cat /etc/default/bazzite); then
gradience-cli import -p /usr/share/ublue-os/bazzite/themes/vapor.json
gradience-cli import -p /usr/share/ublue-os/bazzite/themes/vgui2.json
else
@ -96,7 +95,7 @@ setup-gradience:
enable-vapor-theme:
#!/usr/bin/env bash
if grep "gnome" <<< $(rpm-ostree status); then
if grep "gnome" <<< $(cat /etc/default/bazzite); then
gsettings set org.gnome.desktop.wm.preferences button-layout appmenu:minimize,maximize,close
gsettings set org.gnome.desktop.interface color-scheme prefer-dark
gsettings set org.gnome.desktop.interface gtk-theme adw-gtk3-dark
@ -110,7 +109,7 @@ enable-vapor-theme:
enable-vgui2-theme:
#!/usr/bin/env bash
if grep "gnome" <<< $(rpm-ostree status); then
if grep "gnome" <<< $(cat /etc/default/bazzite); then
gsettings set org.gnome.desktop.wm.preferences button-layout appmenu:minimize,maximize,close
gsettings set org.gnome.desktop.interface color-scheme prefer-dark
gsettings set org.gnome.desktop.interface gtk-theme adw-gtk3-dark