Skip to content

Commit 631423b

Browse files
EyeCantCUKyleGospo
andauthored
feat(ci): Build images based on Fedora 39 (#332)
* feat: Build images based on Fedora 39 * fix(f39): Install kernel specific kmods Installs kmods specific to the kernel/image flavor being used as ASUS and Surface no longer include these * fix(f39): Skip Mesa for now, install 32bit version of Gamescope * chore: Switch to Gradience flatpak * chore: Syntax fix --------- Co-authored-by: Kyle Gospodnetich <me@kylegospodneti.ch>
1 parent 1682676 commit 631423b

File tree

7 files changed

+55
-54
lines changed

7 files changed

+55
-54
lines changed

.github/workflows/build.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,17 @@ jobs:
3939
image_flavor: [main, nvidia, asus, asus-nvidia, framework, surface, surface-nvidia]
4040
base_name: [bazzite, bazzite-deck]
4141
base_image_name: [kinoite, silverblue]
42-
major_version: [38]
42+
major_version: [38, 39]
4343
include:
4444
- major_version: 38
4545
is_latest_version: false
4646
is_stable_version: true
4747
- major_version: 38
4848
is_latest_version: true
4949
is_stable_version: true
50+
- major_version: 38
51+
is_latest_version: true
52+
is_stable_version: false
5053
exclude:
5154
- base_name: bazzite-deck
5255
image_flavor: nvidia
@@ -86,6 +89,13 @@ jobs:
8689
echo "IMAGE_NAME=${{ format('{0}{1}-{2}', matrix.base_name, '${DESKTOP}', matrix.image_flavor) }}" >> $GITHUB_ENV
8790
fi
8891
fi
92+
if [[ "${{ matrix.image_flavor }}" =~ "asus" ]]; then
93+
echo "AKMODS_FLAVOR=asus" >> $GITHUB_ENV
94+
elif [[ "${{ matrix.image_flavor }}" =~ "surface" ]]; then
95+
echo "AKMODS_FLAVOR=surface" >> $GITHUB_ENV
96+
else
97+
echo "AKMODS_FLAVOR=main" >> $GITHUB_ENV
98+
fi
8999
90100
- name: Generate tags
91101
id: generate-tags
@@ -163,6 +173,7 @@ jobs:
163173
IMAGE_FLAVOR=${{ matrix.image_flavor }}
164174
BASE_IMAGE_NAME=${{ matrix.base_image_name }}
165175
FEDORA_MAJOR_VERSION=${{ matrix.major_version }}
176+
AKMODS_FLAVOR=${{ env.AKMODS_FLAVOR }}
166177
labels: ${{ steps.meta.outputs.labels }}
167178
oci: false
168179
extra-args: |

Containerfile

Lines changed: 30 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME:-kinoite}"
22
ARG IMAGE_FLAVOR="${IMAGE_FLAVOR:-main}"
3+
ARG AKMODS_FLAVOR="${AKMODS_FLAVOR:-main}"
34
ARG SOURCE_IMAGE="${SOURCE_IMAGE:-$BASE_IMAGE_NAME-$IMAGE_FLAVOR}"
45
ARG BASE_IMAGE="ghcr.io/ublue-os/${SOURCE_IMAGE}"
56
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION:-38}"
@@ -8,16 +9,16 @@ FROM ${BASE_IMAGE}:${FEDORA_MAJOR_VERSION} AS bazzite
89

910
ARG IMAGE_NAME="${IMAGE_NAME}"
1011
ARG IMAGE_VENDOR="ublue-os"
11-
ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME}"
1212
ARG IMAGE_FLAVOR="${IMAGE_FLAVOR}"
13+
ARG AKMODS_FLAVOR="${AKMODS_FLAVOR}"
14+
ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME}"
1315
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
1416

1517
COPY system_files/desktop/shared system_files/desktop/${BASE_IMAGE_NAME} /
1618

1719
# Add ublue packages, add needed negativo17 repo and then immediately disable due to incompatibility with RPMFusion
18-
COPY --from=ghcr.io/ublue-os/akmods:main-${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms
19-
RUN if [[ "${IMAGE_FLAVOR}" = "main" || "${IMAGE_NAME}" = "nvidia" ]]; then \
20-
sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \
20+
COPY --from=ghcr.io/ublue-os/akmods:${AKMODS_FLAVOR}-${FEDORA_MAJOR_VERSION} /rpms /tmp/akmods-rpms
21+
RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \
2122
wget https://negativo17.org/repos/fedora-multimedia.repo -O /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \
2223
if [[ "${FEDORA_MAJOR_VERSION}" -ge "39" ]]; then \
2324
rpm-ostree install \
@@ -39,8 +40,7 @@ RUN if [[ "${IMAGE_FLAVOR}" = "main" || "${IMAGE_NAME}" = "nvidia" ]]; then \
3940
/tmp/akmods-rpms/kmods/*winesync*.rpm && \
4041
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/negativo17-fedora-multimedia.repo && \
4142
mkdir -p /etc/akmods-rpms/ && \
42-
mv /tmp/akmods-rpms/kmods/*steamdeck*.rpm /etc/akmods-rpms/steamdeck.rpm \
43-
; fi
43+
mv /tmp/akmods-rpms/kmods/*steamdeck*.rpm /etc/akmods-rpms/steamdeck.rpm
4444

4545
# Setup Copr repos
4646
RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/repo/fedora-$(rpm -E %fedora)/kylegospo-bazzite-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \
@@ -54,7 +54,6 @@ RUN wget https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/repo/fedora-$
5454
wget https://copr.fedorainfracloud.org/coprs/kylegospo/wallpaper-engine-kde-plugin/repo/fedora-$(rpm -E %fedora)/kylegospo-wallpaper-engine-kde-plugin-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-wallpaper-engine-kde-plugin.repo && \
5555
wget https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/repo/fedora-$(rpm -E %fedora)/kylegospo-gnome-vrr-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \
5656
wget https://copr.fedorainfracloud.org/coprs/ycollet/audinux/repo/fedora-$(rpm -E %fedora)/ycollet-audinux-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_ycollet-audinux.repo && \
57-
wget https://copr.fedorainfracloud.org/coprs/lyessaadi/gradience/repo/fedora-$(rpm -E %fedora)/lyessaadi-gradience-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_lyessaadi-gradience.repo && \
5857
wget https://copr.fedorainfracloud.org/coprs/kylegospo/rom-properties/repo/fedora-$(rpm -E %fedora)/kylegospo-rom-properties-fedora-$(rpm -E %fedora).repo -O /etc/yum.repos.d/_copr_kylegospo-rom-properties.repo && \
5958
wget https://pkgs.tailscale.com/stable/fedora/tailscale.repo -O /etc/yum.repos.d/tailscale.repo && \
6059
sed -i 's@gpgcheck=1@gpgcheck=0@g' /etc/yum.repos.d/tailscale.repo
@@ -118,7 +117,7 @@ RUN if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
118117
kdeconnectd \
119118
extest.i686 \
120119
rom-properties-kf5 && \
121-
if [ ${FEDORA_MAJOR_VERSION} -lt 39 ]; then \
120+
if [[ "${FEDORA_MAJOR_VERSION}" -lt "39" ]]; then \
122121
rpm-ostree override replace \
123122
--experimental \
124123
--from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr \
@@ -135,7 +134,7 @@ RUN if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
135134
rm -rf /tmp/wallpaper-engine-kde-plugin && \
136135
sed -i 's@After=plasma-core.target@After=plasma-core.target\nAfter=xdg-desktop-portal.service@g' /usr/lib/systemd/user/plasma-xdg-desktop-portal-kde.service \
137136
; else \
138-
if [ ${FEDORA_MAJOR_VERSION} -lt 39 ]; then \
137+
if [[ "${FEDORA_MAJOR_VERSION}" -lt "39" ]]; then \
139138
rpm-ostree override replace \
140139
--experimental \
141140
--from repo=copr:copr.fedorainfracloud.org:kylegospo:gnome-vrr \
@@ -156,7 +155,6 @@ RUN if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
156155
rpm-ostree install \
157156
xwaylandvideobridge \
158157
steamdeck-backgrounds \
159-
gradience \
160158
gnome-randr-rust \
161159
gnome-shell-extension-user-theme \
162160
gnome-shell-extension-gsconnect \
@@ -250,9 +248,7 @@ RUN /tmp/image-info.sh && \
250248
pip install --prefix=/usr yafti && \
251249
pip install --prefix=/usr hyfetch && \
252250
sed -i 's/stage/none/g' /etc/rpm-ostreed.conf && \
253-
if [[ "${IMAGE_FLAVOR}" = "main" || "${IMAGE_NAME}" = "nvidia" ]]; then \
254-
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo \
255-
; fi && \
251+
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \
256252
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \
257253
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \
258254
sed -i 's@enabled=1@enabeld=0@g' /etc/yum.repos.d/_copr_ublue-os-staging.repo && \
@@ -264,15 +260,14 @@ RUN /tmp/image-info.sh && \
264260
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-wallpaper-engine-kde-plugin.repo && \
265261
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-gnome-vrr.repo && \
266262
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ycollet-audinux.repo && \
267-
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_lyessaadi-gradience.repo && \
268263
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-rom-properties.repo && \
269264
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/tailscale.repo && \
270265
sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/user.conf && \
271266
sed -i 's/#DefaultTimeoutStopSec.*/DefaultTimeoutStopSec=15s/' /etc/systemd/system.conf && \
272267
mkdir -p /usr/etc/flatpak/remotes.d && \
273268
wget -q https://dl.flathub.org/repo/flathub.flatpakrepo -P /usr/etc/flatpak/remotes.d && \
274269
systemctl enable com.system76.Scheduler.service && \
275-
if [[ "${IMAGE_FLAVOR}" = "main" || "${IMAGE_NAME}" = "nvidia" ]]; then \
270+
if [[ "${FEDORA_MAJOR_VERSION}" -lt "39" ]]; then \
276271
systemctl enable displaylink.service \
277272
; fi && \
278273
systemctl enable btrfs-dedup@var-home.timer && \
@@ -310,16 +305,14 @@ FROM bazzite as bazzite-deck
310305

311306
ARG IMAGE_NAME="${IMAGE_NAME}"
312307
ARG IMAGE_VENDOR="ublue-os"
313-
ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME}"
314308
ARG IMAGE_FLAVOR="${IMAGE_FLAVOR}"
309+
ARG BASE_IMAGE_NAME="${BASE_IMAGE_NAME}"
315310
ARG FEDORA_MAJOR_VERSION="${FEDORA_MAJOR_VERSION}"
316311

317312
COPY system_files/deck/shared system_files/deck/${BASE_IMAGE_NAME} /
318313

319314
# Setup Copr repos
320-
RUN if [[ "${IMAGE_FLAVOR}" = "main" || "${IMAGE_NAME}" = "nvidia" ]]; then \
321-
sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo \
322-
; fi && \
315+
RUN sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \
323316
sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \
324317
sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \
325318
sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_kylegospo-latencyflex.repo && \
@@ -329,32 +322,30 @@ RUN if [[ "${IMAGE_FLAVOR}" = "main" || "${IMAGE_NAME}" = "nvidia" ]]; then \
329322
sed -i 's@enabled=0@enabled=1@g' /etc/yum.repos.d/_copr_ycollet-audinux.repo
330323

331324
# Install Valve's Steam Deck drivers as kmod
332-
RUN if [[ "${IMAGE_FLAVOR}" = "main" || "${IMAGE_NAME}" = "nvidia" ]]; then \
333-
rpm-ostree install \
325+
RUN rpm-ostree install \
334326
/etc/akmods-rpms/steamdeck.rpm && \
335-
rm -rf /etc/akmods-rpms \
336-
; fi
327+
rm -rf /etc/akmods-rpms
337328

338329
# Install gamescope-limiter patched Mesa and patched udisks2 (Needed for SteamOS SD card mounting)
339-
RUN rpm-ostree override replace \
340-
--experimental \
341-
--from repo=copr:copr.fedorainfracloud.org:kylegospo:bazzite-multilib \
342-
mesa-filesystem \
343-
mesa-dri-drivers \
344-
mesa-libEGL \
345-
mesa-libEGL-devel \
346-
mesa-libgbm \
347-
mesa-libGL \
348-
mesa-libglapi \
349-
mesa-vulkan-drivers && \
350-
if [ ${FEDORA_MAJOR_VERSION} -lt 39 ]; then \
351-
rpm-ostree override replace \
330+
RUN if [[ "${FEDORA_MAJOR_VERSION}" -lt "39" ]]; then \
331+
rpm-ostree override replace \
332+
--experimental \
333+
--from repo=copr:copr.fedorainfracloud.org:kylegospo:bazzite-multilib \
334+
mesa-filesystem \
335+
mesa-dri-drivers \
336+
mesa-libEGL \
337+
mesa-libEGL-devel \
338+
mesa-libgbm \
339+
mesa-libGL \
340+
mesa-libglapi \
341+
mesa-vulkan-drivers && \
342+
rpm-ostree override replace \
352343
--experimental \
353344
--from repo=copr:copr.fedorainfracloud.org:kylegospo:bazzite \
354345
udisks2 \
355346
libudisks2 \
356347
udisks2-btrfs \
357-
; fi
348+
; fi
358349

359350
# Configure KDE & GNOME
360351
RUN if grep -q "kinoite" <<< "${BASE_IMAGE_NAME}"; then \
@@ -460,6 +451,7 @@ RUN rpm-ostree install \
460451
wxGTK \
461452
libFAudio \
462453
gamescope \
454+
gamescope.i686 \
463455
gamescope-session \
464456
wine-core \
465457
winetricks \
@@ -492,9 +484,7 @@ RUN /tmp/image-info.sh && \
492484
; fi && \
493485
cp "/usr/share/ublue-os/firstboot/yafti.yml" "/usr/etc/yafti.yml" && \
494486
sed -i 's/#HandlePowerKey=poweroff/HandlePowerKey=suspend/g' /etc/systemd/logind.conf && \
495-
if [[ "${IMAGE_FLAVOR}" = "main" || "${IMAGE_NAME}" = "nvidia" ]]; then \
496-
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo \
497-
; fi && \
487+
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_ublue-os-akmods.repo && \
498488
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite.repo && \
499489
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo && \
500490
sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-latencyflex.repo && \

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ Ported SteamOS and ChimeraOS packages, among others used by Bazzite, are built o
194194
|ds-inhibit|![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/ds-inhibit/status_image/last_build.png?)|
195195
|duperemove|![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/duperemove/status_image/last_build.png?)|
196196
|[extest](https://github.com/Supreeeme/extest)|![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite-multilib/package/extest/status_image/last_build.png?)|
197-
|gamescope|![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/gamescope/status_image/last_build.png?)|
197+
|gamescope|![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite-multilib/package/gamescope/status_image/last_build.png?)|
198198
|[gamescope-session](https://github.com/ChimeraOS/gamescope-session)|![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/gamescope-session/status_image/last_build.png?)|
199199
|[gnome-randr-rust](https://github.com/maxwellainatchi/gnome-randr-rust)|![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/gnome-randr-rust/status_image/last_build.png?)|
200200
|gnome-shell-extension-bazzite-menu|![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/bazzite/package/gnome-shell-extension-bazzite-menu/status_image/last_build.png?)|
@@ -224,7 +224,6 @@ Additionally, the following packages are used from other Copr repos:
224224
|---|---|
225225
|[gcadapter_oc-kmod](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/)|![Build Status](https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/package/gcadapter_oc-kmod/status_image/last_build.png?)|
226226
|[gnome-vrr](https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/)|![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/gnome-vrr/package/mutter/status_image/last_build.png?)|
227-
|[gradience](https://copr.fedorainfracloud.org/coprs/lyessaadi/gradience/)|![Build Status](https://copr.fedorainfracloud.org/coprs/lyessaadi/gradience/package/gradience/status_image/last_build.png?)|
228227
|[hl2linux-selinux](https://copr.fedorainfracloud.org/coprs/kylegospo/hl2linux-selinux/)|![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/hl2linux-selinux/package/hl2linux-selinux/status_image/last_build.png?)|
229228
|[latencyflex-vulkan-layer](https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/)|![Build Status](https://copr.fedorainfracloud.org/coprs/kylegospo/LatencyFleX/package/latencyflex-vulkan-layer/status_image/last_build.png?)|
230229
|[noise-suppression-for-voice](https://copr.fedorainfracloud.org/coprs/ycollet/audinux/)|![Build Status](https://copr.fedorainfracloud.org/coprs/ycollet/audinux/package/noise-suppression-for-voice/status_image/last_build.png?)|

system_files/desktop/shared/usr/bin/bazzite-flatpak-manager

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
# Script Version
4-
VER=1
4+
VER=2
55
VER_FILE="/etc/bazzite/flatpak_manager_version"
66
VER_RAN=$(cat $VER_FILE)
77

system_files/desktop/shared/usr/bin/bazzite-user-setup

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
# SCRIPT VERSION
4-
USER_SETUP_VER=7
4+
USER_SETUP_VER=8
55
USER_SETUP_VER_FILE="$HOME/.bazzite-configured"
66
USER_SETUP_VER_RAN=$(cat $USER_SETUP_VER_FILE)
77

@@ -60,12 +60,12 @@ else
6060
gsettings set org.gtk.gtk4.settings.file-chooser sort-directories-first true
6161

6262
echo 'Installing Gradience presets'
63-
mkdir -p $HOME/.config/presets/user/
64-
if [[ ! -f "$HOME/.config/presets/user/vapor.json" ]]; then
65-
ln -s /usr/share/ublue-os/bazzite/themes/vapor.json $HOME/.config/presets/user/vapor.json
63+
mkdir -p "$HOME/.var/app/com.github.GradienceTeam.Gradience/config/presets/user/"
64+
if [[ ! -f "$HOME/.var/app/com.github.GradienceTeam.Gradience/config/presets/user/vapor.json" ]]; then
65+
ln -s /usr/share/ublue-os/bazzite/themes/vapor.json $HOME/.var/app/com.github.GradienceTeam.Gradience/config/presets/user/vapor.json
6666
fi
67-
if [[ ! -f "$HOME/.config/presets/user/vgui2.json" ]]; then
68-
ln -s /usr/share/ublue-os/bazzite/themes/vgui2.json $HOME/.config/presets/user/vgui2.json
67+
if [[ ! -f "$HOME/.var/app/com.github.GradienceTeam.Gradience/config/presets/user/vgui2.json" ]]; then
68+
ln -s /usr/share/ublue-os/bazzite/themes/vgui2.json $HOME/.var/app/com.github.GradienceTeam.Gradience/config/presets/user/vgui2.json
6969
fi
7070

7171
if [[ $IMAGE_NAME =~ "deck" || $IMAGE_NAME =~ "ally" || $IMAGE_NAME =~ "framegame" ]]; then

system_files/desktop/shared/usr/share/ublue-os/just/60-custom.just

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -171,10 +171,10 @@ enable-vapor-theme:
171171
gsettings set org.gnome.desktop.interface document-font-name "Noto Sans 11"
172172
gsettings set org.gnome.desktop.interface font-name "Noto Sans 11"
173173
gsettings set org.gnome.desktop.sound theme-name "steam"
174-
gradience-cli flatpak-overrides -e both
174+
flatpak run --command=gradience-cli com.github.GradienceTeam.Gradience flatpak-overrides -e both
175175
sudo flatpak override --filesystem=xdg-config/gtk-4.0
176176
sudo flatpak override --filesystem=xdg-config/gtk-3.0
177-
gradience-cli apply -p /usr/share/ublue-os/bazzite/themes/vapor.json
177+
flatpak run --command=gradience-cli com.github.GradienceTeam.Gradience apply -n "Vapor"
178178
else
179179
echo "This is only supported under GNOME."
180180
fi
@@ -196,10 +196,10 @@ enable-vgui2-theme:
196196
gsettings set org.gnome.desktop.interface document-font-name "Noto Sans 11"
197197
gsettings set org.gnome.desktop.interface font-name "Noto Sans 11"
198198
gsettings set org.gnome.desktop.sound theme-name "steam"
199-
gradience-cli flatpak-overrides -e both
199+
flatpak run --command=gradience-cli com.github.GradienceTeam.Gradience flatpak-overrides -e both
200200
sudo flatpak override --filesystem=xdg-config/gtk-4.0
201201
sudo flatpak override --filesystem=xdg-config/gtk-3.0
202-
gradience-cli apply -p /usr/share/ublue-os/bazzite/themes/vgui2.json
202+
flatpak run --command=gradience-cli com.github.GradienceTeam.Gradience apply -n "VGUI2"
203203
else
204204
echo "This is only supported under GNOME."
205205
fi

system_files/desktop/silverblue/usr/etc/flatpak/install

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
org.mozilla.firefox
2+
com.github.GradienceTeam.Gradience
23
com.mattjakeman.ExtensionManager
34
it.mijorus.gearlever
45
com.github.tchx84.Flatseal

0 commit comments

Comments
 (0)