add icon sync for flatpaks

Reviewed-on: #20

Makefile

@@ -9,4 +9,4 @@ remove:
 	pamac-installer --remove tromjaro-fixes
 
 clean:
-	$(RM) -rf src/ pkg/ *.tar.xz
+	$(RM) -rf src/ pkg/ *.tar.xz

PKGBUILD

@@ -1,6 +1,6 @@
 # Maintainer: TROM <contact@tromsite.com>
 pkgname=tromjaro-fixes
-pkgver=1.4.1
+pkgver=1.6
 pkgrel=1
 pkgdesc="Various fixes for TROMjaro OS"
 arch=(any)
@@ -55,4 +55,4 @@ package() {
     install -d ${pkgdir}/etc/profile.d/
     install -Dm644 ${srcdir}/tromjaro-fixes.sh                              ${pkgdir}/etc/profile.d/
 
-}
+}

alpm-hooks/chaotic-keyring-refresh.hook

@@ -8,4 +8,4 @@ Target = *
 [Action]
 Description = Refreshing the chaotic-aur keyring...
 When = PreTransaction
-Exec = /usr/bin/fix-chaotic-keyring
+Exec = /usr/bin/fix-chaotic-keyring

bin/periodic/fix-flatpaks-theming

@@ -1,16 +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"
 
-if [ ! -e "$home_local_themes_dir" ]; then
+shared_icons_dir=/usr/share/icons/
-    mkdir -p "$home_local_themes_dir"
+home_local_icons_dir="$HOME/.local/share/icons/"
-    echo "Directory $home_local_themes_dir is created."
+source_icon_dirs=("$shared_icons_dir" "$home_local_icons_dir")
-fi
+target_icons_dir="$HOME/.icons"
 
-echo "Set watch for" "${source_theme_dirs[@]}" "directories ..."
+# Function to synchronize themes and icons from source to target directory
-while inotifywait -qr -e 'modify,attrib,move,move_self,create,delete,delete_self,unmount' "${source_theme_dirs[@]}"; do
+sync_themes_and_icons() {
     rsync -av --delete --progress "${source_theme_dirs[@]}" "$target_themes_dir"
-    echo "Directory $target_themes_dir is synchronized with" "${source_theme_dirs[@]}"
+    rsync -av --delete --progress "${source_icon_dirs[@]}" "$target_icons_dir"
-done
+    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,15 +1,22 @@
 #!/bin/bash
+
 sync_theme() {
 	# Get the current system theme
 	theme=$(xfconf-query -c xsettings -p /Net/ThemeName)
-	# Find the best match for the xfwm4 theme that corresponds with the current system theme
+	# Enable syncing the current theme with xfwm4 if not already enabled
-	xfwm4_theme=$(find /usr/share/themes/ /usr/local/share/themes/ "$HOME"/.themes/ "$HOME"/.local/share/themes/ -mindepth 2 -maxdepth 2 -type d -name xfwm4 -printf '%h\n' 2>/dev/null | grep -o "/${theme}[^/]*$" | sort | head -n1)
+	[ "$(xfconf-query -c xsettings -p /Xfce/SyncThemes)" != 'true' ] && xfconf-query -c xsettings -p /Xfce/SyncThemes -n -t bool -s true
-	# If a match is not found then use the Default theme
-	[ -z "$xfwm4_theme" ] && xfwm4_theme='Default'
-	# Apply the xfwm4 theme
-	xfconf-query -c xfwm4 -p /general/theme -n -t string -s "${xfwm4_theme#/}"
 	# Apply the current theme with gsettings
 	gsettings set org.gnome.desktop.interface gtk-theme "$theme"
+	
+	# Apply the current theme for GTK apps in flatpak
+	
+	# Define the path to the flatpak override directory
+	flatpak_override_dir="$HOME/.local/share/flatpak/overrides"
+	# Create the directory if it doesn't exist
+	[ -d "$flatpak_override_dir" ] || mkdir -p "$flatpak_override_dir" || { echo 'failed creating directory!'; return 1; }
+	# Write the theme configuration to the global override file
+	echo "[Environment]
+GTK_THEME=$theme" > "$flatpak_override_dir/global"
 }
 
 sync_font() {
@@ -22,6 +29,7 @@ sync_font() {
 sync_theme
 sync_font
 
+# Monitor when the user changes their system theme or font in XFCE and sync them as needed
 while read -r line; do
 	case "$line" in
 		'set: /Net/ThemeName') sync_theme ;;

bin/periodic/fix-zombie-appicons

@@ -1,79 +1,120 @@
 #!/bin/bash
+
+# Exit out if the same script is already running in the background
 pidof -sq -o %PPID -x "$(basename "$0")" && exit
-datastore="$HOME"/.local/share/fix-zombie-appicons
-bakdir="$datastore"/backup
-data="$datastore"/tweaked-desktop-files
 
-mkdir -p "$bakdir" || { echo "failed to make directory $bakdir"; exit 1; }
+# Setting read-only variables
+declare -r datadir="$HOME"/.local/share/fix-zombie-appicons
+declare -r backup_dir="$datadir"/backup
+declare -r datafile="$datadir"/tweaked-desktop-files
 
-# Directories where desktop files are stored
+# Desktop files stored here will take precedence over the other ones
-user="$HOME"/.local/share/applications
+declare -r home_local_applications_dir="$HOME/.local/share/applications"
-pacman_global=/usr/share/applications
-pacman_local=/usr/local/share/applications
-flatpak_global=/var/lib/flatpak/exports/share/applications
-flatpak_local="$HOME"/.local/share/flatpak/exports/share/applications
-snap=/var/lib/snapd/desktop/applications
 
-mkdir -p "$user" "$flatpak_local" || { echo "failed to make directoris $user & $flatpak_local"; exit 1; }
+# Go through each item in $XDG_DATA_DIRS to find all other directories
+# except home_local_applications_dir where desktop files are stored, and
+# save these to other_applications_dirs
+while read -r dir; do
+	full_dir_path=${dir%/}/applications
+	other_applications_dirs+=("$full_dir_path")
 
-detectfiles() {
+	# Directories inside user's home directory
-	for file in "$user"/*.desktop; do
+	[[ "$full_dir_path" = "$HOME"/* ]] && dirs_inside_user_home+=("$full_dir_path")
-		name=$(basename "$file") || continue
+
-		[ -d "$file" ] || grep -xq "$name" "$data" && continue
+done < <(echo "$XDG_DATA_DIRS" | tr ':' '\n' | sort -u | grep -vFx "$home_local_applications_dir")
-		[ -f "$pacman_global/$name" ] ||
+
-			[ -f "$pacman_local/$name" ] ||
+declare -r other_applications_dirs dirs_inside_user_home
-			[ -f "$flatpak_global/$name" ] ||
+
-			[ -f "$flatpak_local/$name" ] ||
+# Create tempfile which is used by the fix_desktop_files function
-			[ -f "$snap/$name" ] &&
+tempfile="$(mktemp)"
-			echo "$name" >> "$data"
+trap 'rm $tempfile' EXIT # Delete tempfile when the script exits
+declare -r tempfile
+
+# This function will check for new desktop files in home_local_applications_dir and
+# record them in datafile if the same file is found in any of the other_applications_dirs.
+detect_new_desktop_files() {
+	for file in "$home_local_applications_dir"/*.desktop; do
+		# This is added as a failsafe to ensure its a file and not a directory
+		[ -d "$file" ] && continue
+		filename=$(basename "$file")
+		# Continue looping if the filename is already recorded in the datafile
+		grep -xq "$filename" "$datafile" && continue
+		# If the same file is present in any of the other_applications_dirs then add its filename to datafile
+		for dir in "${other_applications_dirs[@]}"; do
+			[ -f "$dir/$filename" ] && echo "$filename" >> "$datafile" && break
+		done
 	done
 }
 
-fixfiles() {
+# The following function will:
-	lastmod=$(stat -c "%Y" "$data")
+#    1. Go through all the files recorded in datafile and move them to backup_dir if
-	tmp="$(mktemp)"
+#       the same file is not found in other_applications_dirs anymore.
-	trap 'rm $tmp' EXIT
+#    2. Go through all the bakked up files in backup_dir and move them back to
-	[ -f "$data" ] && cp "$data" "$tmp" && copied='true'
+#       its original_file_path if the same file is present in any of
-	lineno=0
+#       the other_applications_dirs. This will not overwrite if a new
-	[ "$copied" = 'true' ] && while IFS= read -r name; do
+#       file already exists at original_file_path.
-		((lineno++))
-		file="$user/$name"
-		[ -f "$file" ] || { sed -i "${lineno}d" "$tmp" && ((lineno--)) ; continue; }
-		[ -f "$pacman_global/$name" ] ||
-			[ -f "$pacman_local/$name" ] ||
-			[ -f "$flatpak_global/$name" ] ||
-			[ -f "$flatpak_local/$name" ] ||
-			[ -f "$snap/$name" ] ||
-			mv "$file" "$bakdir/$name.bak"
-	done < "$data"
 
-	[ "$copied" = 'true' ] && [ "$(stat -c '%Y' "$data")" = "$lastmod" ] && sort "$tmp" | uniq > "$data"
+fix_desktop_files() {
+	# This is added as a failsafe to avoid overwriting datafile in case the file got edited during this period
+	local -r last_modified_time=$(stat -c "%Y" "$datafile")
+	# Copy datafile to tempfile because its not possible to directly edit the file inside a while-read loop
+	[ -f "$datafile" ] && cp "$datafile" "$tempfile" && local -r datafile_copied='true'
+	local -i line_number=0
 
-	for bakfile in "$bakdir"/*.desktop.bak; do
+	# Loop through each line in datafile
-		name=$(basename "${bakfile%.bak}") || continue
+	[ "$datafile_copied" = 'true' ] && while IFS='' read -r filename; do
-		origfile="$user/$name"
+		line_number+=1
-		[ -f "$origfile" ] && continue
+		file="$home_local_applications_dir/$filename"
-		[ -f "$pacman_global/$name" ] ||
+		# If the file don't exist anymore then remove the line from datafile (as tempfile) and continue looping
-			[ -f "$pacman_local/$name" ] ||
+		[ -f "$file" ] || { sed -i "${line_number}d" "$tempfile" && line_number+=-1 ; continue; }
-			[ -f "$flatpak_global/$name" ] ||
+
-			[ -f "$flatpak_local/$name" ] ||
+		# If the same file is not present in any of the other_applications_dirs then move the file to backup_dir
-			[ -f "$snap/$name" ] &&
+		unset file_exists
-			mv "$bakfile" "$origfile"
+		for dir in "${other_applications_dirs[@]}"; do
+			[ -f "$dir/$filename" ] && file_exists='true' && break
+		done
+		[ "$file_exists" != 'true' ] && mv "$file" "$backup_dir/$filename.bak"
+	done < "$datafile"
+
+	# Write the contents from tempfile back to datafile after sorting and removing duplicate lines
+	[ "$datafile_copied" = 'true' ] && [ "$(stat -c '%Y' "$datafile")" = "$last_modified_time" ] && sort -u "$tempfile" > "$datafile"
+
+	for bakfile in "$backup_dir"/*.desktop.bak; do
+		filename=$(basename "${bakfile%.bak}")
+		original_file_path="$home_local_applications_dir/$filename"
+
+		# Continue looping if a new file is already present at the original_file_path,
+		# this will prevent the backup from overwriting the new file
+		[ -f "$original_file_path" ] && continue
+
+		# If the same bakked up file is present in any of the other_applications_dirs then move it back to its original_file_path
+		for dir in "${other_applications_dirs[@]}"; do
+			[ -f "$dir/$filename" ] && mv "$bakfile" "$original_file_path" && break
+		done
 	done
 }
 
-existing_dirs=()
+# Create some directories in the user's home directory if they don't already exist
-for dir in "$user" "$pacman_global" "$pacman_local" "$flatpak_global" "$flatpak_local" "$snap"; do
+mkdir -p "$datadir" "$backup_dir" "$home_local_applications_dir" ||
-	[ -d "$dir" ] && existing_dirs=("${existing_dirs[@]}" "$dir")
+	{ echo "failed to make directories $datadir, $backup_dir & $home_local_applications_dir"; exit 1; }
+
+# Try to create dirs_inside_user_home if they don't already exist
+[ ${#dirs_inside_user_home[@]} -gt 0 ] && mkdir -p "${dirs_inside_user_home[@]}"
+
+# Check which directories currently exist on the user's system so that inotifywait can monitor them for changes
+for dir in "$home_local_applications_dir" "${other_applications_dirs[@]}"; do
+	[ -d "$dir" ] && currently_existing_dirs+=("$dir")
 done
 
-detectfiles
+# Both functions will be run once when the script first starts
-fixfiles
+detect_new_desktop_files
+fix_desktop_files
 
-while read -r line; do
+# Inotifywait monitors currently_existing_dirs and the functions are run each time when there is a change in relevant directories
-	if [ "$line" = "$user/" ]; then
+while IFS='' read -r line; do
-		detectfiles
+	if [ "$line" = "$home_local_applications_dir/" ]; then
+		detect_new_desktop_files
 	else
-		fixfiles
+		fix_desktop_files
 	fi
-done < <(inotifywait -qm --format '%w' --include '\.desktop$' -e 'move,move_self,create,delete,delete_self,unmount' "${existing_dirs[@]}")
+done < <(inotifywait -qm --format '%w' --include '\.desktop$' -e 'move,move_self,create,delete,delete_self,unmount' "${currently_existing_dirs[@]}")

bin/standalone/fix-chaotic-keyring

@@ -1,2 +1,2 @@
 #!/bin/bash
-pacman-key --populate chaotic
+pacman-key --populate chaotic

flatpak-overrides/global

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

tromjaro-fixes.sh

@@ -14,4 +14,4 @@ export LESS_TERMCAP_us=$'\e[1;32m'
 export LESS_TERMCAP_ue=$'\e[0m'
 
 # Disable the beep sound
-xset b off
+[ -n "$DISPLAY" ] && xset b off