From 26e4ef792c2107da626003db85c414e8299eef6c Mon Sep 17 00:00:00 2001 From: Adam Fidel Date: Thu, 16 Jan 2025 18:06:17 -0600 Subject: [PATCH 1/2] feat: set QT_QPA_PLATFORMTHEME in flatpaks for user --- system_files/shared/usr/libexec/ublue-flatpak-manager | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/system_files/shared/usr/libexec/ublue-flatpak-manager b/system_files/shared/usr/libexec/ublue-flatpak-manager index 8135663b..dc29d7c0 100755 --- a/system_files/shared/usr/libexec/ublue-flatpak-manager +++ b/system_files/shared/usr/libexec/ublue-flatpak-manager @@ -1,7 +1,7 @@ #!/usr/bin/bash # Script Version -VER=2 +VER=3 VER_FILE="${XDG_DATA_HOME:-$HOME/.local/share}/ublue/flatpak_manager_version" VER_RAN=$(cat "$VER_FILE") @@ -13,6 +13,8 @@ if [[ -f $VER_FILE && $VER = "$VER_RAN" ]]; then exit 0 fi +flatpak override --env=QT_QPA_PLATFORMTHEME=kde + # Set up Firefox default configuration mkdir -p /var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/$(arch)/stable/defaults/pref rm -f /var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/$(arch)/stable/defaults/pref/*aurora*.js @@ -21,6 +23,8 @@ rm -f /var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/$(arch)/stable # Use until yafti rework is done flatpak --system update -y -notify-send "Welcome to Aurora" "Your computer is ready!" --app-name="Flatpak Manager Service" -u NORMAL +if [[ -z $VER_RAN ]]; then + notify-send "Welcome to Aurora" "Your computer is ready!" --app-name="Flatpak Manager Service" -u NORMAL +fi echo $VER >"$VER_FILE" From ba7ec95557a0b3bca1bd95317981f8a865ac150e Mon Sep 17 00:00:00 2001 From: Adam Fidel Date: Fri, 17 Jan 2025 11:06:06 -0600 Subject: [PATCH 2/2] feat: overrides for Qt/GTK theming in flatpaks --- system_files/shared/usr/libexec/ublue-flatpak-manager | 8 ++------ system_files/shared/usr/libexec/ublue-user-setup | 6 +++++- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/system_files/shared/usr/libexec/ublue-flatpak-manager b/system_files/shared/usr/libexec/ublue-flatpak-manager index dc29d7c0..8135663b 100755 --- a/system_files/shared/usr/libexec/ublue-flatpak-manager +++ b/system_files/shared/usr/libexec/ublue-flatpak-manager @@ -1,7 +1,7 @@ #!/usr/bin/bash # Script Version -VER=3 +VER=2 VER_FILE="${XDG_DATA_HOME:-$HOME/.local/share}/ublue/flatpak_manager_version" VER_RAN=$(cat "$VER_FILE") @@ -13,8 +13,6 @@ if [[ -f $VER_FILE && $VER = "$VER_RAN" ]]; then exit 0 fi -flatpak override --env=QT_QPA_PLATFORMTHEME=kde - # Set up Firefox default configuration mkdir -p /var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/$(arch)/stable/defaults/pref rm -f /var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/$(arch)/stable/defaults/pref/*aurora*.js @@ -23,8 +21,6 @@ rm -f /var/lib/flatpak/extension/org.mozilla.firefox.systemconfig/$(arch)/stable # Use until yafti rework is done flatpak --system update -y -if [[ -z $VER_RAN ]]; then - notify-send "Welcome to Aurora" "Your computer is ready!" --app-name="Flatpak Manager Service" -u NORMAL -fi +notify-send "Welcome to Aurora" "Your computer is ready!" --app-name="Flatpak Manager Service" -u NORMAL echo $VER >"$VER_FILE" diff --git a/system_files/shared/usr/libexec/ublue-user-setup b/system_files/shared/usr/libexec/ublue-user-setup index 141b0339..1f9d548d 100755 --- a/system_files/shared/usr/libexec/ublue-user-setup +++ b/system_files/shared/usr/libexec/ublue-user-setup @@ -1,7 +1,7 @@ #!/usr/bin/bash # SCRIPT VERSION -USER_SETUP_VER=7 +USER_SETUP_VER=8 USER_SETUP_VER_FILE="${XDG_DATA_HOME:-$HOME/.local/share}/ublue/user-setup" USER_SETUP_VER_RAN=$(cat "$USER_SETUP_VER_FILE") VEN_ID="$(cat /sys/devices/virtual/dmi/id/chassis_vendor)" @@ -57,6 +57,10 @@ if [[ ":Framework:" =~ ":$VEN_ID:" ]]; then fi fi +# More consistent Qt/GTK themes for Flatpaks +flatpak override --env=QT_QPA_PLATFORMTHEME=kde +flatpak override --filesystem=xdg-config/gtk-4.0:ro + # Handle privileged tasks pkexec /usr/libexec/ublue-privileged-user-setup