feat: Add new ublue wallpaper as the default

fix(kde): Fix issue with theme picker under KDE6 for Vapor and VGUI2.
ublue-os · Apr 29, 2024 · 3c79d31 · 3c79d31
1 parent 96f1be0
commit 3c79d31
Show file tree

Hide file tree

Showing 9 changed files with 94 additions and 7 deletions.
diff --git a/spec_files/steamdeck-kde-presets/metadata_vapor.json b/spec_files/steamdeck-kde-presets/metadata_vapor.json
@@ -0,0 +1,23 @@
+{
+    "KPackageStructure": "Plasma/LookAndFeel",
+    "KPlugin": {
+        "Authors": [
+            {
+                "Email": "",
+                "Name": "Valve"
+            }
+        ],
+        "Category": "",
+        "Description": "The stock SteamOS theme",
+        "Id": "com.valve.vapor.desktop",
+        "License": "GPLv2+",
+        "Name": "Vapor",
+        "ServiceTypes": [
+            "Plasma/LookAndFeel"
+        ],
+        "Version": "0.01",
+        "Website": "https://steampowered.com/"
+    },
+    "X-KDE-ParentApp": "",
+    "X-Plasma-MainScript": "defaults"
+}
diff --git a/spec_files/steamdeck-kde-presets/metadata_vgui2.json b/spec_files/steamdeck-kde-presets/metadata_vgui2.json
@@ -0,0 +1,23 @@
+{
+    "KPackageStructure": "Plasma/LookAndFeel",
+    "KPlugin": {
+        "Authors": [
+            {
+                "Email": "",
+                "Name": "Valve"
+            }
+        ],
+        "Category": "",
+        "Description": "Any color you like, as long as it's green",
+        "Id": "com.valve.vgui.desktop",
+        "License": "GPLv2+",
+        "Name": "Aurora",
+        "ServiceTypes": [
+            "Plasma/LookAndFeel"
+        ],
+        "Version": "0.01",
+        "Website": "https://steampowered.com/"
+    },
+    "X-KDE-ParentApp": "",
+    "X-Plasma-MainScript": "defaults"
+}
diff --git a/spec_files/steamdeck-kde-presets/steamdeck-kde-presets-desktop.spec b/spec_files/steamdeck-kde-presets/steamdeck-kde-presets-desktop.spec
@@ -9,9 +9,12 @@ Source0:        https://gitlab.com/evlaV/steamdeck-kde-presets/-/archive/master/
 Source1:        kdeglobals-desktop
 Source2:        steamdeck-le.svg
 Source3:        bazzite_logo.svgz
+Source4:        metadata_vapor.json
+Source5:        metadata_vgui2.json
 Patch0:         multiuser.patch
 Patch1:         lockscreen.patch
 Patch2:         bazzite_logo.patch
+Patch3:         ublue.patch
 
 BuildArch:      noarch
 
@@ -69,6 +72,8 @@ rm %{buildroot}%{_datadir}/plasma/look-and-feel/com.valve.vapor.desktop/contents
 rm %{buildroot}%{_datadir}/plasma/look-and-feel/com.valve.vgui.desktop/contents/splash/images/deck_logo.svgz
 cp %{SOURCE3} %{buildroot}%{_datadir}/plasma/look-and-feel/com.valve.vapor.desktop/contents/splash/images/bazzite_logo.svgz
 cp %{SOURCE3} %{buildroot}%{_datadir}/plasma/look-and-feel/com.valve.vgui.desktop/contents/splash/images/bazzite_logo.svgz
+cp %{SOURCE4} %{buildroot}%{_datadir}/plasma/look-and-feel/com.valve.vapor.desktop/metadata.json
+cp %{SOURCE5} %{buildroot}%{_datadir}/plasma/look-and-feel/com.valve.vgui.desktop/metadata.json
 
 # Do post-installation
 %post

diff --git a/spec_files/steamdeck-kde-presets/steamdeck-kde-presets.spec b/spec_files/steamdeck-kde-presets/steamdeck-kde-presets.spec
@@ -8,10 +8,13 @@ URL:            https://github.com/ublue-os/bazzite
 Source0:        https://gitlab.com/evlaV/%{name}/-/archive/master/%{name}-master.tar.gz
 Source1:        steamdeck-le.svg
 Source2:        bazzite_logo.svgz
+Source3:        metadata_vapor.json
+Source4:        metadata_vgui2.json
 BuildArch:      noarch
 Patch0:         fedora.patch
 Patch1:         kdeglobals.patch
 Patch2:         bazzite_logo.patch
+Patch3:         ublue.patch
 
 Requires:       kde-filesystem
 
@@ -57,6 +60,8 @@ rm %{buildroot}%{_bindir}/steamos-nested-desktop
 rm -rf %{buildroot}%{_datadir}/applications/steam/steamos-nested-desktop
 cp %{SOURCE2} %{buildroot}%{_datadir}/plasma/look-and-feel/com.valve.vapor.desktop/contents/splash/images/bazzite_logo.svgz
 cp %{SOURCE2} %{buildroot}%{_datadir}/plasma/look-and-feel/com.valve.vgui.desktop/contents/splash/images/bazzite_logo.svgz
+cp %{SOURCE3} %{buildroot}%{_datadir}/plasma/look-and-feel/com.valve.vapor.desktop/metadata.json
+cp %{SOURCE4} %{buildroot}%{_datadir}/plasma/look-and-feel/com.valve.vgui.desktop/metadata.json
 mkdir -p %{buildroot}%{_datadir}/kio/servicemenus
 mv %{buildroot}%{_datadir}/kservices5/ServiceMenus/steam.desktop %{buildroot}%{_datadir}/kio/servicemenus/steam.desktop
 rm -rf %{buildroot}%{_datadir}/kservices5

diff --git a/spec_files/steamdeck-kde-presets/ublue.patch b/spec_files/steamdeck-kde-presets/ublue.patch
@@ -0,0 +1,18 @@
+diff -Naur steamdeck-kde-presets-master/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.folder.js "steamdeck-kde-presets-master (Copy)/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.folder.js"
+--- a/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.folder.js
++++ b/usr/share/plasma/look-and-feel/com.valve.vapor.desktop/contents/plasmoidsetupscripts/org.kde.plasma.folder.js
+@@ -1,4 +1,4 @@
+ applet.wallpaperPlugin = 'org.kde.image'
+ applet.currentConfigGroup = ["Wallpaper", "org.kde.image", "General"]
+-applet.writeConfig("Image", "/usr/share/wallpapers/ublue.png")
++applet.writeConfig("Image", "/usr/share/wallpapers/Steam Deck Logo Default.jpg")
+ applet.reloadConfig()
+diff -Naur steamdeck-kde-presets-master/usr/share/plasma/look-and-feel/com.valve.vgui.desktop/contents/plasmoidsetupscripts/org.kde.plasma.folder.js "steamdeck-kde-presets-master (Copy)/usr/share/plasma/look-and-feel/com.valve.vgui.desktop/contents/plasmoidsetupscripts/org.kde.plasma.folder.js"
+--- a/usr/share/plasma/look-and-feel/com.valve.vgui.desktop/contents/plasmoidsetupscripts/org.kde.plasma.folder.js
++++ b/usr/share/plasma/look-and-feel/com.valve.vgui.desktop/contents/plasmoidsetupscripts/org.kde.plasma.folder.js
+@@ -1,4 +1,4 @@
+ applet.wallpaperPlugin = 'org.kde.image'
+ applet.currentConfigGroup = ["Wallpaper", "org.kde.image", "General"]
+-applet.writeConfig("Image", "/usr/share/wallpapers/ublue.png")
++applet.writeConfig("Image", "/usr/share/wallpapers/Steam Deck Logo Default.jpg")
+ applet.reloadConfig()
diff --git a/system_files/desktop/kinoite/usr/share/wallpapers/ublue.png b/system_files/desktop/kinoite/usr/share/wallpapers/ublue.png
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
@@ -24,17 +24,17 @@ titlebar-font='Noto Sans Medium 11'
 [org/gnome/desktop/background]
 color-shading-type='solid'
 picture-options='zoom'
-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'
-primary-color='#1A2336'
-secondary-color='#211B33'
+picture-uri='file:///usr/share/backgrounds/ublue.png'
+picture-uri-dark='file:///usr/share/backgrounds/ublue.png'
+primary-color='#202646'
+secondary-color='#36438E'
 
 [org/gnome/desktop/screensaver]
 color-shading-type='solid'
 picture-options='zoom'
-picture-uri='file:///usr/share/backgrounds/steamdeck/Steam%20Deck%20Logo%20Default.jpg'
-primary-color='#1A2336'
-secondary-color='#211B33'
+picture-uri='file:///usr/share/backgrounds/ublue.png'
+primary-color='#202646'
+secondary-color='#36438E'
 
 [org/gnome/shell/extensions/just-perfection]
 animation=4

diff --git a/system_files/desktop/silverblue/usr/share/backgrounds/ublue.png b/system_files/desktop/silverblue/usr/share/backgrounds/ublue.png
diff --git a/system_files/desktop/silverblue/usr/share/gnome-background-properties/ublue.xml b/system_files/desktop/silverblue/usr/share/gnome-background-properties/ublue.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
+<wallpapers>
+  <wallpaper deleted="false">
+    <name>Universal Blue</name>
+    <filename>/usr/share/backgrounds/ublue.png</filename>
+    <filename-dark>/usr/share/backgrounds/ublue.png</filename-dark>
+    <options>zoom</options>
+    <shade_type>solid</shade_type>
+    <pcolor>#202646</pcolor>
+    <scolor>#36438E</scolor>
+  </wallpaper>
+</wallpapers>