add icon sync for flatpaks

PKGBUILD

@@ -1,7 +1,7 @@
 # Maintainer: TROM <contact@tromsite.com>
 pkgname=tromjaro-fixes
-pkgver=2
+pkgver=1.6
-pkgrel=3.3
+pkgrel=1
 pkgdesc="Various fixes for TROMjaro OS"
 arch=(any)
 url=""
@@ -10,11 +10,9 @@ depends=('xfce4-appfinder'
          'xdotool'
          'rsync'
          'inotify-tools'
-         'qt5gtk2'
+         'qt5-styleplugins'
-         'qt6gtk2-git'
+         'qt6gtk2'
-         'qqc2-desktop-style5'
+         'qqc2-desktop-style')
-         'yad')
-conflicts=('qt5-styleplugins')
 provides=('tromjaro-fixes')
 backup=()
 options=(!strip)

bin/periodic/fix-flatpaks-theming

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# Set the directory paths
+shared_themes_dir=/usr/share/themes/
+home_local_themes_dir="$HOME/.local/share/themes/"
+source_theme_dirs=("$shared_themes_dir" "$home_local_themes_dir")
+target_themes_dir="$HOME/.themes"
+
+shared_icons_dir=/usr/share/icons/
+home_local_icons_dir="$HOME/.local/share/icons/"
+source_icon_dirs=("$shared_icons_dir" "$home_local_icons_dir")
+target_icons_dir="$HOME/.icons"
+
+# Function to synchronize themes and icons from source to target directory
+sync_themes_and_icons() {
+    rsync -av --delete --progress "${source_theme_dirs[@]}" "$target_themes_dir"
+    rsync -av --delete --progress "${source_icon_dirs[@]}" "$target_icons_dir"
+    echo "Directories $target_themes_dir and $target_icons_dir are synchronized with source directories"
+}
+
+# Create the target and local directories if they don't exist
+mkdir -p "$target_themes_dir" "$home_local_themes_dir" "$target_icons_dir" "$home_local_icons_dir" ||
+	{ echo "failed to make directories $target_themes_dir & $home_local_themes_dir & $target_icons_dir & $home_local_icons_dir"; exit 1; }
+
+echo "Set watch for theme directories: ${source_theme_dirs[@]}, and icon directories: ${source_icon_dirs[@]}"
+
+# Start watching for file changes in the source theme and icon directories
+inotifywait -qmr -e 'modify,attrib,move,move_self,create,delete,delete_self,unmount' "${source_theme_dirs[@]}" "${source_icon_dirs[@]}" |
+while read -r events; do
+    sync_themes_and_icons
+done

bin/periodic/fix-theming

@@ -1,229 +1,38 @@
 #!/bin/bash
-# shellcheck disable=SC2016
-
-# This script will sync your XFCE theme & font to work systemwide and in
-# a consistent manner accross different apps. It also improves
-# the highDPI scaling to give you a better experience.
-
-# Exit out if the same script is already running in the background
-pidof -sq -o %PPID -x "$(basename "$0")" && exit
-
-# Set the directory/file paths
-declare -r flatpak_themes_dir="$HOME/.themes"
-declare -r config_dir="${XDG_CONFIG_HOME:-$HOME/.config}"
-declare -r profile="$HOME/.profile"
-
-# Create directories if they don't exist
-mkdir -p "$flatpak_themes_dir" "$config_dir" ||
-	{ echo "failed to make directories $flatpak_themes_dir & $config_dir"; exit 1; }
-
-# Enable option for syncing the current theme with XFWM theme if not already enabled
-[ "$(xfconf-query -c xsettings -p /Xfce/SyncThemes)" != 'true' ] &&
-	xfconf-query -c xsettings -p /Xfce/SyncThemes -n -t bool -s true
-
-# Make sure ~/.profile is sourced inside ~/.bash_profile and ~/.zprofile
-source_profile() {
-	for file in "$HOME/.bash_profile" "$HOME/.zprofile"; do
-		# Continue looping if it is already sourced
-		grep -Exq '\s*(.*&& )?\. "?\$HOME"?/\.profile"?\s*' "$file" ||
-			grep -Exq "\s*(.*&& )?\. ~/\.profile\s*" "$file" && continue
-		# If not then source it
-		if grep -q '\S' "$file"; then
-			# shellcheck disable=SC2015
-			tail -n1 "$file" | grep -qx '\s*' &&
-				local -r begin='' || local -r begin='\n'
-			printf '%b[ -f "$HOME/.profile" ] && . "$HOME/.profile"\n' "$begin" >> "$file"
-		else
-			echo '[ -f "$HOME/.profile" ] && . "$HOME/.profile"' > "$file"
-		fi
-	done
-}
-source_profile
-
-xdg_directory_lookup() {
-	# Go through each item in $XDG_DATA_DIRS and find the subdirectory $1
-	while read -r dir; do
-		local subdir="${dir%/}/$1"
-		if [ -d "$subdir" ]; then
-			echo "$subdir"
-			break
-		fi
-	done < <(printf '%s:%s\n' "$HOME/.local/share" "$XDG_DATA_DIRS" | tr ':' '\n')
-}
-
-theme_exists() {
-	local -r theme_dir=$(xdg_directory_lookup "themes/$1")
-	[ -d "$theme_dir" ]
-}
-
-# Function for setting variables in ~/.profile
-profile_set_variable() {
-	# Return if the variable is already set to the correct value
-	grep -xq "\s*export\s\+$1=$2\s*" "$profile" && return
-
-	# If the variable is set to a different value then remove that line
-	grep -q "^\s*export\s\+$1=" "$profile" && sed -i "/^\s*export\s\+$1=/d" "$profile"
-
-	# Set the variable to the correct value under a comment mentioning this script
-	if grep -xq '\s*#\s*Values set by the fix-theming script\s*' "$profile"; then
-		sed -i "/^\s*#\s*Values set by the fix-theming script\s*$/a export $1=$2" "$profile"
-	elif grep -q '\S' "$profile"; then
-		# shellcheck disable=SC2015
-		tail -n1 "$profile" | grep -qx '\s*' &&
-			local -r begin='' || local -r begin='\n'
-		printf '%b# Values set by the fix-theming script\nexport %s=%s\n' "$begin" "$1" "$2" >> "$profile"
-	else
-		printf '# Values set by the fix-theming script\nexport %s=%s\n' "$1" "$2" > "$profile"
-	fi
-
-	logout_required='true'
-}
-
-set_QT_scaling() {
-	for var in QT_SCALE_FACTOR QT_AUTO_SCREEN_SCALE_FACTOR QT_ENABLE_HIGHDPI_SCALING; do
-		profile_set_variable "$var" "$1"
-	done
-}
-
-set_cursor_size() {
-	xfconf-query -c xsettings -p /Gtk/CursorThemeSize -s "$1"
-}
-
-set_xfwm_theme() {
-	xfconf-query -c xfwm4 -p /general/theme -n -t string -s "$1"
-}
-
-# Use the highDPI variant of the XFWM theme
-use_hdpi_theme_variant() {
-	# shellcheck disable=SC2015
-	[ -n "$1" ] && local -r xfwm_theme="$1" ||
-		local -r xfwm_theme=$(xfconf-query -c xfwm4 -p /general/theme)
-
-	for variant in xhdpi hdpi; do
-		# If this variant of the theme is already enabled then break out of the loop
-		[ "${xfwm_theme##*-}" = "$variant" ] && break
-
-		# Store the name for this variant of the theme in highDPI_theme variable
-		local highDPI_theme=$xfwm_theme-$variant
-
-		if theme_exists "$highDPI_theme"; then
-			set_xfwm_theme "$highDPI_theme"
-			[ -z "$1" ] &&
-				notify-send "XFWM theme changed to $highDPI_theme" "Changed to the highDPI variant of your chosen theme because you've enabled highDPI on your system"
-			break
-		fi
-	done
-	if ! theme_exists "$highDPI_theme"; then
-		[ -n "$1" ] && theme_exists "$1" && set_xfwm_theme "$1"
-	fi
-}
-
-# Use the normal variant of the XFWM theme
-use_normal_theme_variant() {
-	local -r current_xfwm_theme=$(xfconf-query -c xfwm4 -p /general/theme)
-
-	for variant in xhdpi hdpi; do
-		# Continue looping if this (highDPI) variant of the theme is not enabled
-		[ "${current_xfwm_theme##*-}" != "$variant" ] && continue
-
-		# Store the name for the normal variant of this theme in normal_theme variable
-		local normal_theme=${current_xfwm_theme%-"$variant"}
-
-		if theme_exists "$normal_theme"; then
-			set_xfwm_theme "$normal_theme"
-			notify-send "XFWM theme changed to $normal_theme" "Changed to the normal variant of your chosen theme because you've disabled highDPI on your system"
-			break
-		fi
-	done
-}
-
-# Change XFWM theme, QT apps scaling, and mouse cursor size according to
-# the user's current window scaling (highDPI setting)
-hdpi_theme_fix() {
-	local -r current_window_scaling=$(xfconf-query -c xsettings -p /Gdk/WindowScalingFactor)
-	local -r current_cursor_size=$(xfconf-query -c xsettings -p /Gtk/CursorThemeSize)
-
-	unset logout_required
-
-	if [ "$current_window_scaling" -eq '2' ]; then
-		# Increase scaling for QT apps
-		set_QT_scaling 2
-		# Use the highDPI variant of the XFWM theme
-		use_hdpi_theme_variant
-		if [ "$current_cursor_size" -eq 25 ]; then
-			set_cursor_size '45'
-			notify-send 'Mouse cursor size increased to 45' "Changed to a larger mouse cursor because you've enabled highDPI on your system"
-		fi
-	else
-		# Decrease scaling for QT apps
-		set_QT_scaling 1
-		# Use the normal variant of the XFWM theme
-		use_normal_theme_variant
-		if [ "$current_cursor_size" -eq 45 ]; then
-			set_cursor_size '25'
-			notify-send 'Mouse cursor size decreased to 25' "Changed to a smaller mouse cursor because you've disabled highDPI on your system"
-		fi
-	fi
-
-	# Show popup menu about logout if it's required
-	[ "$logout_required" = 'true' ] &&
-		yad  --image "dialog-question" --title "Alert" --buttons-layout=center --text-align=center --button=yad-yes:0 --button=yad-no:1 --text 'Logout is required in order to apply your DPI preferences to QT apps.\nWould you like to logout now?' &&
-		xfce4-session-logout --logout
-}
 
 sync_theme() {
 	# Get the current system theme
-	local -r current_theme=$(xfconf-query -c xsettings -p /Net/ThemeName)
+	theme=$(xfconf-query -c xsettings -p /Net/ThemeName)
-	# Get the current window scaling factor (highDPI setting)
+	# Enable syncing the current theme with xfwm4 if not already enabled
-	local -r current_window_scaling=$(xfconf-query -c xsettings -p /Gdk/WindowScalingFactor)
+	[ "$(xfconf-query -c xsettings -p /Xfce/SyncThemes)" != 'true' ] && xfconf-query -c xsettings -p /Xfce/SyncThemes -n -t bool -s true
-
 	# Apply the current theme with gsettings
-	gsettings set org.gnome.desktop.interface gtk-theme "$current_theme"
+	gsettings set org.gnome.desktop.interface gtk-theme "$theme"
-
+	
-	# Apply the current theme for GTK and Libadwaita apps on flatpak
+	# Apply the current theme for GTK apps in flatpak
-	flatpak override --user --env=GTK_THEME="$current_theme"
+	
-
+	# Define the path to the flatpak override directory
-	# Apply the current theme for XFWM unless it's initial_sync on system reboot
+	flatpak_override_dir="$HOME/.local/share/flatpak/overrides"
-	if [ "$1" != 'initial_sync' ]; then
+	# Create the directory if it doesn't exist
-		# Use the highDPI variant of the XFWM theme if the current_window_scaling factor is 2
+	[ -d "$flatpak_override_dir" ] || mkdir -p "$flatpak_override_dir" || { echo 'failed creating directory!'; return 1; }
-		if [ "$current_window_scaling" -eq '2' ]; then
+	# Write the theme configuration to the global override file
-			use_hdpi_theme_variant "$current_theme"
+	echo "[Environment]
-		else
+GTK_THEME=$theme" > "$flatpak_override_dir/global"
-			set_xfwm_theme "$current_theme"
-		fi
-	fi
-
-	# Cleanup flatpak_themes_dir and remove ~/.config/gtk-4.0
-	rm -rf "${flatpak_themes_dir:?}"/{*,.*} "$config_dir/gtk-4.0"
-
-	# Find the directory where the current theme is stored
-	local -r current_theme_dir=$(xdg_directory_lookup "themes/$current_theme")
-
-	if [ -d "$current_theme_dir" ]; then
-		# Copy/sync current_theme_dir to flatpak_themes_dir
-		rsync -av --delete --progress "$current_theme_dir" "$flatpak_themes_dir"
-		# Create symlink for gtk-4.0 directory
-		ln -s "$current_theme_dir/gtk-4.0" "$config_dir"
-	fi
 }
 
 sync_font() {
 	# Get the current system font
-	local -r current_font=$(xfconf-query -c xsettings -p /Gtk/FontName)
+	font=$(xfconf-query -c xsettings -p /Gtk/FontName)
-	# Apply the same font for the title of XFCE windows
+	# Apply the same font for the title of xfce windows
-	xfconf-query -c xfwm4 -p /general/title_font -n -t string -s "$current_font"
+	xfconf-query -c xfwm4 -p /general/title_font -n -t string -s "$font"
 }
 
-# Initial synchronization
+sync_theme
-sync_theme 'initial_sync'
 sync_font
 
-# Monitor when the user changes their system theme, font or
+# Monitor when the user changes their system theme or font in XFCE and sync them as needed
-# DPI setting in XFCE and sync them as needed
 while read -r line; do
 	case "$line" in
 		'set: /Net/ThemeName') sync_theme ;;
-		'set: /Gdk/WindowScalingFactor') hdpi_theme_fix ;;
 		'set: /Gtk/FontName') sync_font ;;
 	esac
 done < <(xfconf-query -c xsettings -m)

flatpak-overrides/global

@@ -1,2 +1,5 @@
 [Context]
-filesystems=~/.config/gtk-4.0;~/.themes;~/.icons;xdg-config/gtk-4.0;
+filesystems=~/.config/gtk-4.0;~/.themes;~/.icons;xdg-config/gtk-4.0;xdg-config/Kvantum:ro;
+
+[Environment]
+QT_STYLE_OVERRIDE=kvantum

systemd/services/fix-flatpaks-theming.service

@@ -0,0 +1,15 @@
+# This service unit is for fix-flatpaks-theming script
+#
+
+[Unit]
+Description=Fix flatpak theming script
+StartLimitIntervalSec=0
+
+[Service]
+Type=simple
+Restart=always
+RestartSec=1
+ExecStart=/usr/bin/fix-flatpaks-theming
+
+[Install]
+WantedBy=default.target

tromjaro-fixes.sh

@@ -1,5 +1,6 @@
 # Sync the QT with GTK
-export QT_QPA_PLATFORMTHEME="qt6gtk2"
+export QT_QPA_PLATFORMTHEME="gtk2"
+export QT_QUICK_CONTROLS_STYLE="gtk2"
 export QT_AUTO_SCREEN_SCALE_FACTOR=1
 
 # Show color output in less