Skip to content

Commit 9d5f158

Browse files
committedDec 19, 2023
feat(gnome): Fix text fringing on OLED displays.
chore(gnome): Drop Gradience as an optional feature, continue to install theme for Gradience so it can be added by the end-user.
1 parent 20bf74d commit 9d5f158

File tree

9 files changed

+20
-125
lines changed

9 files changed

+20
-125
lines changed
 

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ Builds with the GNOME desktop environment are available in both desktop and deck
134134
- [Variable refresh rate support and fractional scaling enabled under Wayland](https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1154).
135135
- Custom menu in the top bar for returning to game mode, launching Steam, and opening a number of useful utilities. <sub><sup>(Only on Steam Deck builds)</sup></sub>
136136
- [GSConnect](https://extensions.gnome.org/extension/1319/gsconnect/) preinstalled and ready to use.
137-
- Features optional Valve-inspired themes matching Vapor and VGUI2 from SteamOS.
137+
- Features optional Valve-inspired themes matching Vapor and VGUI2 from SteamOS. Install [Gradience](https://flathub.org/apps/com.github.GradienceTeam.Gradience) to make use of them.
138138
- [Hanabi extension](https://github.com/jeffshee/gnome-ext-hanabi) included to offer similar features to Wallpaper Engine in KDE.
139139
- Numerous optional extensions pre-installed, including [important user experience fixes](https://www.youtube.com/watch?v=nbCg9_YgKgM).
140140
- Automatic updates for the [Firefox GNOME theme](https://github.com/rafaelmardojai/firefox-gnome-theme) and [Thunderbird GNOME theme](https://github.com/rafaelmardojai/thunderbird-gnome-theme). <sup><sub>(If installed)</sub></sup>

‎system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml

-13
Original file line numberDiff line numberDiff line change
@@ -244,19 +244,6 @@ screens:
244244
- SaveDesktop: io.github.vikdevelop.SaveDesktop
245245
- Syncthing: com.github.zocker_160.SyncThingy
246246
- VLC: org.videolan.VLC
247-
theme:
248-
source: yafti.screen.title
249-
values:
250-
title: "GNOME Theme"
251-
condition:
252-
run: grep -q 'silverblue' <<< $(jq -r '."base-image-name"' < /usr/share/ublue-os/image-info.json)
253-
links:
254-
- "Vapor Theme":
255-
run: ujust enable-vapor-theme
256-
- "VGUI2 Theme":
257-
run: ujust enable-vgui2-theme
258-
description: |
259-
Optionally apply a Valve-inspired theme to GNOME via Gradience. Note that custom themes are not officially supported by GNOME and some applications can break. Please avoid reporting issues to application developers until you've tested against the default theme.
260247
final-screen:
261248
source: yafti.screen.title
262249
values:

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

-46
Original file line numberDiff line numberDiff line change
@@ -160,52 +160,6 @@ patch-gmod:
160160
/tmp/patch-gmod/GModCEFCodecFix-Linux
161161
rm -rf /tmp/patch-gmod
162162

163-
# Activate Valve-inspired Vapor theme on GNOME
164-
enable-vapor-theme:
165-
#!/usr/bin/env bash
166-
IMAGE_INFO="/usr/share/ublue-os/image-info.json"
167-
BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO)
168-
if [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then
169-
gnome-extensions enable user-theme@gnome-shell-extensions.gcampax.github.com
170-
gsettings set org.gnome.mutter center-new-windows true
171-
gsettings set org.gnome.desktop.wm.preferences button-layout appmenu:minimize,maximize,close
172-
gsettings set org.gnome.desktop.interface color-scheme prefer-dark
173-
gsettings set org.gnome.desktop.interface gtk-theme adw-gtk3-dark
174-
gsettings set org.gnome.desktop.background picture-uri file:///usr/share/backgrounds/steamdeck/Steam\ Deck\ Logo\ Default.jpg
175-
gsettings set org.gnome.desktop.background picture-uri-dark file:///usr/share/backgrounds/steamdeck/Steam\ Deck\ Logo\ Default.jpg
176-
gsettings set org.gnome.desktop.wm.preferences titlebar-font "Noto Sans Medium 11"
177-
gsettings set org.gnome.desktop.interface document-font-name "Noto Sans 11"
178-
gsettings set org.gnome.desktop.interface font-name "Noto Sans 11"
179-
gsettings set org.gnome.desktop.sound theme-name "steam"
180-
gradience-cli flatpak-overrides -e both
181-
gradience-cli apply -p /usr/share/ublue-os/bazzite/themes/vapor.json
182-
else
183-
echo "This is only supported under GNOME."
184-
fi
185-
186-
# Activate Valve-inspired VGUI2 theme on GNOME
187-
enable-vgui2-theme:
188-
#!/usr/bin/env bash
189-
IMAGE_INFO="/usr/share/ublue-os/image-info.json"
190-
BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO)
191-
if [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then
192-
gnome-extensions enable user-theme@gnome-shell-extensions.gcampax.github.com
193-
gsettings set org.gnome.mutter center-new-windows true
194-
gsettings set org.gnome.desktop.wm.preferences button-layout appmenu:minimize,maximize,close
195-
gsettings set org.gnome.desktop.interface color-scheme prefer-dark
196-
gsettings set org.gnome.desktop.interface gtk-theme adw-gtk3-dark
197-
gsettings set org.gnome.desktop.background picture-uri file:///usr/share/backgrounds/steamdeck/VGUI2.jpg
198-
gsettings set org.gnome.desktop.background picture-uri-dark file:///usr/share/backgrounds/steamdeck/VGUI2.jpg
199-
gsettings set org.gnome.desktop.wm.preferences titlebar-font "Noto Sans Medium 11"
200-
gsettings set org.gnome.desktop.interface document-font-name "Noto Sans 11"
201-
gsettings set org.gnome.desktop.interface font-name "Noto Sans 11"
202-
gsettings set org.gnome.desktop.sound theme-name "steam"
203-
gradience-cli flatpak-overrides -e both
204-
gradience-cli apply -p /usr/share/ublue-os/bazzite/themes/vgui2.json
205-
else
206-
echo "This is only supported under GNOME."
207-
fi
208-
209163
# Install Adwaita-for-Steam theme for CSS Loader (https://github.com/tkashkin/Adwaita-for-Steam)
210164
install-adwaita-for-steam:
211165
#!/usr/bin/env bash

‎system_files/deck/silverblue/usr/etc/dconf/db/local.d/06-bazzite-deck

+15
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,18 @@ power-button-action='suspend'
2121

2222
[org/gnome/desktop/sound]
2323
theme-name='steam'
24+
25+
[org/gnome/desktop/interface]
26+
document-font-name='Noto Sans 11'
27+
font-name='Noto Sans 11'
28+
font-antialiasing='rgba'
29+
30+
[org/gnome/desktop/wm/preferences]
31+
titlebar-font='Noto Sans Medium 11'
32+
33+
[org/gnome/desktop/background]
34+
picture-uri='file:///usr/share/backgrounds/steamdeck/Steam%20Deck%20Logo%20Default.jpg'
35+
picture-uri-dark='file:///usr/share/backgrounds/steamdeck/Steam%20Deck%20Logo%20Default.jpg'
36+
picture-options='zoom'
37+
primary-color='1A2336'
38+
secondary-color='211B33'

‎system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml

-13
Original file line numberDiff line numberDiff line change
@@ -219,19 +219,6 @@ screens:
219219
- SaveDesktop: io.github.vikdevelop.SaveDesktop
220220
- Syncthing: com.github.zocker_160.SyncThingy
221221
- VLC: org.videolan.VLC
222-
theme:
223-
source: yafti.screen.title
224-
values:
225-
title: "GNOME Theme"
226-
condition:
227-
run: grep -q 'silverblue' <<< $(jq -r '."base-image-name"' < /usr/share/ublue-os/image-info.json)
228-
links:
229-
- "Vapor Theme":
230-
run: ujust enable-vapor-theme
231-
- "VGUI2 Theme":
232-
run: ujust enable-vgui2-theme
233-
description: |
234-
Optionally apply a Valve-inspired theme to GNOME via Gradience. Note that custom themes are not officially supported by GNOME and some applications can break. Please avoid reporting issues to application developers until you've tested against the default theme.
235222
final-screen:
236223
source: yafti.screen.title
237224
values:

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

-50
Original file line numberDiff line numberDiff line change
@@ -115,56 +115,6 @@ patch-gmod:
115115
/tmp/patch-gmod/GModCEFCodecFix-Linux
116116
rm -rf /tmp/patch-gmod
117117

118-
# Activate Valve-inspired Vapor theme on GNOME
119-
enable-vapor-theme:
120-
#!/usr/bin/env bash
121-
IMAGE_INFO="/usr/share/ublue-os/image-info.json"
122-
BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO)
123-
if [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then
124-
gnome-extensions enable user-theme@gnome-shell-extensions.gcampax.github.com
125-
gsettings set org.gnome.mutter center-new-windows true
126-
gsettings set org.gnome.desktop.wm.preferences button-layout appmenu:minimize,maximize,close
127-
gsettings set org.gnome.desktop.interface color-scheme prefer-dark
128-
gsettings set org.gnome.desktop.interface gtk-theme adw-gtk3-dark
129-
gsettings set org.gnome.desktop.background picture-uri file:///usr/share/backgrounds/steamdeck/Steam\ Deck\ Logo\ Default.jpg
130-
gsettings set org.gnome.desktop.background picture-uri-dark file:///usr/share/backgrounds/steamdeck/Steam\ Deck\ Logo\ Default.jpg
131-
gsettings set org.gnome.desktop.wm.preferences titlebar-font "Noto Sans Medium 11"
132-
gsettings set org.gnome.desktop.interface document-font-name "Noto Sans 11"
133-
gsettings set org.gnome.desktop.interface font-name "Noto Sans 11"
134-
gsettings set org.gnome.desktop.sound theme-name "steam"
135-
flatpak run --command=gradience-cli com.github.GradienceTeam.Gradience flatpak-overrides -e both
136-
sudo flatpak override --filesystem=xdg-config/gtk-4.0
137-
sudo flatpak override --filesystem=xdg-config/gtk-3.0
138-
flatpak run --command=gradience-cli com.github.GradienceTeam.Gradience apply -n "Vapor"
139-
else
140-
echo "This is only supported under GNOME."
141-
fi
142-
143-
# Activate Valve-inspired VGUI2 theme on GNOME
144-
enable-vgui2-theme:
145-
#!/usr/bin/env bash
146-
IMAGE_INFO="/usr/share/ublue-os/image-info.json"
147-
BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO)
148-
if [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then
149-
gnome-extensions enable user-theme@gnome-shell-extensions.gcampax.github.com
150-
gsettings set org.gnome.mutter center-new-windows true
151-
gsettings set org.gnome.desktop.wm.preferences button-layout appmenu:minimize,maximize,close
152-
gsettings set org.gnome.desktop.interface color-scheme prefer-dark
153-
gsettings set org.gnome.desktop.interface gtk-theme adw-gtk3-dark
154-
gsettings set org.gnome.desktop.background picture-uri file:///usr/share/backgrounds/steamdeck/VGUI2.jpg
155-
gsettings set org.gnome.desktop.background picture-uri-dark file:///usr/share/backgrounds/steamdeck/VGUI2.jpg
156-
gsettings set org.gnome.desktop.wm.preferences titlebar-font "Noto Sans Medium 11"
157-
gsettings set org.gnome.desktop.interface document-font-name "Noto Sans 11"
158-
gsettings set org.gnome.desktop.interface font-name "Noto Sans 11"
159-
gsettings set org.gnome.desktop.sound theme-name "steam"
160-
flatpak run --command=gradience-cli com.github.GradienceTeam.Gradience flatpak-overrides -e both
161-
sudo flatpak override --filesystem=xdg-config/gtk-4.0
162-
sudo flatpak override --filesystem=xdg-config/gtk-3.0
163-
flatpak run --command=gradience-cli com.github.GradienceTeam.Gradience apply -n "VGUI2"
164-
else
165-
echo "This is only supported under GNOME."
166-
fi
167-
168118
# Install Adwaita-for-Steam theme for CSS Loader (https://github.com/tkashkin/Adwaita-for-Steam)
169119
install-adwaita-for-steam:
170120
#!/usr/bin/env bash

‎system_files/desktop/silverblue/usr/etc/dconf/db/local.d/04-bazzite-folders

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ name='X-Pardus-Apps.directory'
1212
translate=true
1313

1414
[org/gnome/desktop/app-folders/folders/Utilities]
15-
apps=['gnome-abrt.desktop', 'gnome-system-log.desktop', 'nm-connection-editor.desktop', 'org.gnome.baobab.desktop', 'org.gnome.Connections.desktop', 'org.gnome.DejaDup.desktop', 'org.gnome.Dictionary.desktop', 'org.gnome.DiskUtility.desktop', 'org.gnome.Evince.desktop', 'org.gnome.FileRoller.desktop', 'org.gnome.fonts.desktop', 'org.gnome.seahorse.Application.desktop', 'org.gnome.tweaks.desktop', 'org.gnome.Usage.desktop', 'vinagre.desktop', 'fish.desktop', 'nvtop.desktop', 'yelp.desktop', 'btop.desktop', 'com.github.GradienceTeam.Gradience.desktop', 'com.github.tchx84.Flatseal.desktop', 'io.github.flattool.Warehouse.desktop', 'it.mijorus.gearlever.desktop', 'com.mattjakeman.ExtensionManager.desktop', 'io.github.fastrizwaan.WineZGUI.desktop', 'steamos-nested-desktop.desktop']
15+
apps=['gnome-abrt.desktop', 'gnome-system-log.desktop', 'nm-connection-editor.desktop', 'org.gnome.baobab.desktop', 'org.gnome.Connections.desktop', 'org.gnome.DejaDup.desktop', 'org.gnome.Dictionary.desktop', 'org.gnome.DiskUtility.desktop', 'org.gnome.Evince.desktop', 'org.gnome.FileRoller.desktop', 'org.gnome.fonts.desktop', 'org.gnome.seahorse.Application.desktop', 'org.gnome.tweaks.desktop', 'org.gnome.Usage.desktop', 'vinagre.desktop', 'fish.desktop', 'nvtop.desktop', 'yelp.desktop', 'btop.desktop', 'com.github.tchx84.Flatseal.desktop', 'io.github.flattool.Warehouse.desktop', 'it.mijorus.gearlever.desktop', 'com.mattjakeman.ExtensionManager.desktop', 'io.github.fastrizwaan.WineZGUI.desktop', 'steamos-nested-desktop.desktop']
1616
categories=['X-GNOME-Utilities']
1717
name='X-GNOME-Utilities.directory'
1818
translate=true

‎system_files/desktop/silverblue/usr/etc/dconf/db/local.d/06-bazzite-theme

+3
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ color-scheme='prefer-dark'
99

1010
[org/gnome/desktop/interface]
1111
gtk-theme='adw-gtk3-dark'
12+
13+
[org/gnome/mutter]
14+
center-new-windows=true

‎system_files/desktop/silverblue/usr/share/ublue-os/bazzite/flatpak/install

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
org.mozilla.firefox
2-
com.github.GradienceTeam.Gradience
32
com.mattjakeman.ExtensionManager
43
io.github.fastrizwaan.WineZGUI
54
it.mijorus.gearlever

0 commit comments

Comments
 (0)
Please sign in to comment.