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.
ublue-os · Dec 19, 2023 · 9d5f158 · 9d5f158
1 parent 20bf74d
commit 9d5f158
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 125 deletions.
diff --git a/README.md b/README.md
@@ -134,7 +134,7 @@ Builds with the GNOME desktop environment are available in both desktop and deck
 - [Variable refresh rate support and fractional scaling enabled under Wayland](https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1154).
 - 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>
 - [GSConnect](https://extensions.gnome.org/extension/1319/gsconnect/) preinstalled and ready to use.
-- Features optional Valve-inspired themes matching Vapor and VGUI2 from SteamOS.
+- 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.
 - [Hanabi extension](https://github.com/jeffshee/gnome-ext-hanabi) included to offer similar features to Wallpaper Engine in KDE.
 - Numerous optional extensions pre-installed, including [important user experience fixes](https://www.youtube.com/watch?v=nbCg9_YgKgM).
 - 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>

diff --git a/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml b/system_files/deck/shared/usr/share/ublue-os/firstboot/yafti.yml
@@ -244,19 +244,6 @@ screens:
           - SaveDesktop: io.github.vikdevelop.SaveDesktop
           - Syncthing: com.github.zocker_160.SyncThingy
           - VLC: org.videolan.VLC
-  theme:
-    source: yafti.screen.title
-    values:
-      title: "GNOME Theme"
-      condition:
-        run: grep -q 'silverblue' <<< $(jq -r '."base-image-name"' < /usr/share/ublue-os/image-info.json)
-      links:
-      - "Vapor Theme":
-          run: ujust enable-vapor-theme
-      - "VGUI2 Theme":
-          run: ujust enable-vgui2-theme
-      description: |
-        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.
   final-screen:
     source: yafti.screen.title
     values:

diff --git a/system_files/deck/shared/usr/share/ublue-os/just/60-custom.just b/system_files/deck/shared/usr/share/ublue-os/just/60-custom.just
@@ -160,52 +160,6 @@ patch-gmod:
     /tmp/patch-gmod/GModCEFCodecFix-Linux
     rm -rf /tmp/patch-gmod
 
-# Activate Valve-inspired Vapor theme on GNOME
-enable-vapor-theme:
-    #!/usr/bin/env bash
-    IMAGE_INFO="/usr/share/ublue-os/image-info.json"
-    BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO)
-    if [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then
-      gnome-extensions enable user-theme@gnome-shell-extensions.gcampax.github.com
-      gsettings set org.gnome.mutter center-new-windows true
-      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
-      gsettings set org.gnome.desktop.background picture-uri file:///usr/share/backgrounds/steamdeck/Steam\ Deck\ Logo\ Default.jpg
-      gsettings set org.gnome.desktop.background picture-uri-dark file:///usr/share/backgrounds/steamdeck/Steam\ Deck\ Logo\ Default.jpg
-      gsettings set org.gnome.desktop.wm.preferences titlebar-font "Noto Sans Medium 11"
-      gsettings set org.gnome.desktop.interface document-font-name "Noto Sans 11"
-      gsettings set org.gnome.desktop.interface font-name "Noto Sans 11"
-      gsettings set org.gnome.desktop.sound theme-name "steam"
-      gradience-cli flatpak-overrides -e both
-      gradience-cli apply -p /usr/share/ublue-os/bazzite/themes/vapor.json
-    else 
-      echo "This is only supported under GNOME."
-    fi
-
-# Activate Valve-inspired VGUI2 theme on GNOME
-enable-vgui2-theme:
-    #!/usr/bin/env bash
-    IMAGE_INFO="/usr/share/ublue-os/image-info.json"
-    BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO)
-    if [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then
-      gnome-extensions enable user-theme@gnome-shell-extensions.gcampax.github.com
-      gsettings set org.gnome.mutter center-new-windows true
-      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
-      gsettings set org.gnome.desktop.background picture-uri file:///usr/share/backgrounds/steamdeck/VGUI2.jpg
-      gsettings set org.gnome.desktop.background picture-uri-dark file:///usr/share/backgrounds/steamdeck/VGUI2.jpg
-      gsettings set org.gnome.desktop.wm.preferences titlebar-font "Noto Sans Medium 11"
-      gsettings set org.gnome.desktop.interface document-font-name "Noto Sans 11"
-      gsettings set org.gnome.desktop.interface font-name "Noto Sans 11"
-      gsettings set org.gnome.desktop.sound theme-name "steam"
-      gradience-cli flatpak-overrides -e both
-      gradience-cli apply -p /usr/share/ublue-os/bazzite/themes/vgui2.json
-    else 
-      echo "This is only supported under GNOME."
-    fi
-
 # Install Adwaita-for-Steam theme for CSS Loader (https://github.com/tkashkin/Adwaita-for-Steam)
 install-adwaita-for-steam:
     #!/usr/bin/env bash

diff --git a/system_files/deck/silverblue/usr/etc/dconf/db/local.d/06-bazzite-deck b/system_files/deck/silverblue/usr/etc/dconf/db/local.d/06-bazzite-deck
@@ -21,3 +21,18 @@ power-button-action='suspend'
 
 [org/gnome/desktop/sound]
 theme-name='steam'
+
+[org/gnome/desktop/interface]
+document-font-name='Noto Sans 11'
+font-name='Noto Sans 11'
+font-antialiasing='rgba'
+
+[org/gnome/desktop/wm/preferences]
+titlebar-font='Noto Sans Medium 11'
+
+[org/gnome/desktop/background]
+picture-uri='file:///usr/share/backgrounds/steamdeck/Steam%20Deck%20Logo%20Default.jpg'
+picture-uri-dark='file:///usr/share/backgrounds/steamdeck/Steam%20Deck%20Logo%20Default.jpg'
+picture-options='zoom'
+primary-color='1A2336'
+secondary-color='211B33'
diff --git a/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml b/system_files/desktop/shared/usr/share/ublue-os/firstboot/yafti.yml
@@ -219,19 +219,6 @@ screens:
           - SaveDesktop: io.github.vikdevelop.SaveDesktop
           - Syncthing: com.github.zocker_160.SyncThingy
           - VLC: org.videolan.VLC
-  theme:
-    source: yafti.screen.title
-    values:
-      title: "GNOME Theme"
-      condition:
-        run: grep -q 'silverblue' <<< $(jq -r '."base-image-name"' < /usr/share/ublue-os/image-info.json)
-      links:
-      - "Vapor Theme":
-          run: ujust enable-vapor-theme
-      - "VGUI2 Theme":
-          run: ujust enable-vgui2-theme
-      description: |
-        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.
   final-screen:
     source: yafti.screen.title
     values:

diff --git a/system_files/desktop/shared/usr/share/ublue-os/just/60-custom.just b/system_files/desktop/shared/usr/share/ublue-os/just/60-custom.just
@@ -115,56 +115,6 @@ patch-gmod:
     /tmp/patch-gmod/GModCEFCodecFix-Linux
     rm -rf /tmp/patch-gmod
 
-# Activate Valve-inspired Vapor theme on GNOME
-enable-vapor-theme:
-    #!/usr/bin/env bash
-    IMAGE_INFO="/usr/share/ublue-os/image-info.json"
-    BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO)
-    if [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then
-      gnome-extensions enable user-theme@gnome-shell-extensions.gcampax.github.com
-      gsettings set org.gnome.mutter center-new-windows true
-      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
-      gsettings set org.gnome.desktop.background picture-uri file:///usr/share/backgrounds/steamdeck/Steam\ Deck\ Logo\ Default.jpg
-      gsettings set org.gnome.desktop.background picture-uri-dark file:///usr/share/backgrounds/steamdeck/Steam\ Deck\ Logo\ Default.jpg
-      gsettings set org.gnome.desktop.wm.preferences titlebar-font "Noto Sans Medium 11"
-      gsettings set org.gnome.desktop.interface document-font-name "Noto Sans 11"
-      gsettings set org.gnome.desktop.interface font-name "Noto Sans 11"
-      gsettings set org.gnome.desktop.sound theme-name "steam"
-      flatpak run --command=gradience-cli com.github.GradienceTeam.Gradience flatpak-overrides -e both
-      sudo flatpak override --filesystem=xdg-config/gtk-4.0
-      sudo flatpak override --filesystem=xdg-config/gtk-3.0
-      flatpak run --command=gradience-cli com.github.GradienceTeam.Gradience apply -n "Vapor"
-    else
-      echo "This is only supported under GNOME."
-    fi
-
-# Activate Valve-inspired VGUI2 theme on GNOME
-enable-vgui2-theme:
-    #!/usr/bin/env bash
-    IMAGE_INFO="/usr/share/ublue-os/image-info.json"
-    BASE_IMAGE_NAME=$(jq -r '."base-image-name"' < $IMAGE_INFO)
-    if [[ ${BASE_IMAGE_NAME} == 'silverblue' ]]; then
-      gnome-extensions enable user-theme@gnome-shell-extensions.gcampax.github.com
-      gsettings set org.gnome.mutter center-new-windows true
-      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
-      gsettings set org.gnome.desktop.background picture-uri file:///usr/share/backgrounds/steamdeck/VGUI2.jpg
-      gsettings set org.gnome.desktop.background picture-uri-dark file:///usr/share/backgrounds/steamdeck/VGUI2.jpg
-      gsettings set org.gnome.desktop.wm.preferences titlebar-font "Noto Sans Medium 11"
-      gsettings set org.gnome.desktop.interface document-font-name "Noto Sans 11"
-      gsettings set org.gnome.desktop.interface font-name "Noto Sans 11"
-      gsettings set org.gnome.desktop.sound theme-name "steam"
-      flatpak run --command=gradience-cli com.github.GradienceTeam.Gradience flatpak-overrides -e both
-      sudo flatpak override --filesystem=xdg-config/gtk-4.0
-      sudo flatpak override --filesystem=xdg-config/gtk-3.0
-      flatpak run --command=gradience-cli com.github.GradienceTeam.Gradience apply -n "VGUI2"
-    else 
-      echo "This is only supported under GNOME."
-    fi
-
 # Install Adwaita-for-Steam theme for CSS Loader (https://github.com/tkashkin/Adwaita-for-Steam)
 install-adwaita-for-steam:
     #!/usr/bin/env bash

diff --git a/system_files/desktop/silverblue/usr/etc/dconf/db/local.d/04-bazzite-folders b/system_files/desktop/silverblue/usr/etc/dconf/db/local.d/04-bazzite-folders
@@ -12,7 +12,7 @@ name='X-Pardus-Apps.directory'
 translate=true
 
 [org/gnome/desktop/app-folders/folders/Utilities]
-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']
+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']
 categories=['X-GNOME-Utilities']
 name='X-GNOME-Utilities.directory'
 translate=true

diff --git a/system_files/desktop/silverblue/usr/etc/dconf/db/local.d/06-bazzite-theme b/system_files/desktop/silverblue/usr/etc/dconf/db/local.d/06-bazzite-theme
@@ -9,3 +9,6 @@ color-scheme='prefer-dark'
 
 [org/gnome/desktop/interface]
 gtk-theme='adw-gtk3-dark'
+
+[org/gnome/mutter]
+center-new-windows=true
diff --git a/system_files/desktop/silverblue/usr/share/ublue-os/bazzite/flatpak/install b/system_files/desktop/silverblue/usr/share/ublue-os/bazzite/flatpak/install
@@ -1,5 +1,4 @@
 org.mozilla.firefox
-com.github.GradienceTeam.Gradience
 com.mattjakeman.ExtensionManager
 io.github.fastrizwaan.WineZGUI
 it.mijorus.gearlever