initial commit

Makefile

@@ -0,0 +1,12 @@
+# makefile for tromjaro fixes package
+build:
+	makepkg
+
+install:
+	pamac-installer tromjaro-fixes-*.tar.xz
+
+remove:
+	pamac-installer --remove tromjaro-fixes
+
+clean:
+	$(RM) -rf src/ pkg/ *.tar.xz

PKGBUILD

@@ -0,0 +1,37 @@
+# Maintainer: TROM <contact@tromsite.com>
+pkgname=tromjaro-fixes
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="Various fixes for TROMjaro OS"
+arch=(any)
+url=""
+license=(unknown)
+depends=()
+provides=('tromjaro-fixes')
+backup=()
+options=(!strip)
+install='fixes-package.install'
+
+prepare() {
+    cp -R ../bin ../flatpak-overrides ../alpm-hooks ../systemd . 
+}
+
+package() {
+    # copy scripts
+    install -d ${pkgdir}/usr/bin
+    install -Dm755 ${srcdir}/bin/standalone/*                          ${pkgdir}/usr/bin
+    install -Dm755 ${srcdir}/bin/periodic/*                            ${pkgdir}/usr/bin
+
+    # copy systemd units
+    install -d ${pkgdir}/usr/lib/systemd/system
+    install -Dm644 ${srcdir}/systemd/services/*                        ${pkgdir}/usr/lib/systemd/system
+    install -Dm644 ${srcdir}/systemd/timers/*                          ${pkgdir}/usr/lib/systemd/system
+
+    # copy alpm hooks
+    install -d ${pkgdir}/usr/share/libalpm/hooks
+    install -Dm644 ${srcdir}/alpm-hooks/*                              ${pkgdir}/usr/share/libalpm/hooks
+
+    # copy flatpak overrides
+    install -d ${pkgdir}/var/lib/flatpak/overrides
+    install -Dm644 ${srcdir}/flatpak-overrides/*                       ${pkgdir}/var/lib/flatpak/overrides
+}

README.md

@@ -0,0 +1,21 @@
+# TROMjaro fixes package
+
+Various fixes for TROMjaro OS
+
+## Building the package
+
+Open Terminal and issue the command:
+
+`make`
+
+To install the package right after the building, use:
+
+`make install`
+
+To remove just installed package, use:
+
+`make remove`
+
+To cleanup the project, use:
+
+`make clean`

alpm-hooks/chaotic-keyring-refresh.hook

@@ -0,0 +1,11 @@
+[Trigger]
+Operation = Upgrade
+Operation = Remove
+Operation = Install
+Type = Package
+Target = *
+
+[Action]
+Description = Refreshing the chaotic-aur keyring...
+When = PreTransaction
+Exec = /usr/bin/chaotic-keyring-refresh

alpm-hooks/reinstall-for-qt.hook

@@ -0,0 +1,11 @@
+[Trigger]
+Operation = Upgrade
+Type = Package
+Target = qt5-base
+Target = qt6-base
+
+
+[Action]
+Description = Reinstalling needed packages for theming QT applications...
+When = PostTransaction
+Exec = /usr/bin/reinstall-for-qt

bin/periodic/fix-flatpaks-theming

@@ -0,0 +1,4 @@
+#!/bin/sh
+rm -r ~/.themes/* 2> /dev/null
+rsync -av --progress /usr/share/themes/* ~/.themes/ --exclude Windowck
+rsync -av --progress ~/.local/share/themes/* ~/.themes/ --exclude Windowck-dark

bin/periodic/fix-theming

@@ -0,0 +1,34 @@
+#!/bin/sh
+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
+	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)
+	# 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"
+}
+sync_icon_theme() {
+	# Get the current icon theme
+	icon_theme=$(xfconf-query -c xsettings -p /Net/IconThemeName)
+	# Apply the same theme in qt5ct and qt6ct configuration
+	sed -i "s/^icon_theme=.*$/icon_theme=$icon_theme/" "$HOME"/.config/qt5ct/qt5ct.conf
+	sed -i "s/^icon_theme=.*$/icon_theme=$icon_theme/" "$HOME"/.config/qt6ct/qt6ct.conf
+}
+
+# Get the current system theme
+theme_new=$(xfconf-query -c xsettings -p /Net/ThemeName)
+# Get the current icon theme
+icon_theme_new=$(xfconf-query -c xsettings -p /Net/IconThemeName)
+
+# Run sync_theme if the new system theme doesn't match the previous one
+[ "$theme_new" != "$theme_prev" ] && sync_theme
+# Run sync_icon_theme if the new icon theme doesn't match the previous one
+[ "$icon_theme_new" != "$icon_theme_prev" ] && sync_icon_theme
+
+# The new values become the previous values
+theme_prev=$theme_new
+icon_theme_prev=$icon_theme_new

bin/periodic/fix-tweaked-desktop-files

@@ -0,0 +1,86 @@
+#!/bin/bash
+pidof -sq -o %PPID -x "$(basename "$0")" && exit
+data="$HOME"/.local/share/applications/tweaked-desktop-files
+data2="$HOME"/.local/share/applications/bakkedup-desktop-files
+
+# Directories where desktop files are stored
+user="$HOME"/.local/share/applications
+flatpak_local="$HOME"/.local/share/flatpak/exports/share/applications
+flatpak_global=/var/lib/flatpak/exports/share/applications
+pacman_local=/usr/local/share/applications
+pacman_global=/usr/share/applications
+snap=/var/lib/snapd/desktop/applications
+
+detectfiles() {
+	for file in "$user"/*.desktop; do
+		name=$(basename "$file") || continue
+		[ -d "$file" ] || grep -xq "\(flatpak-local\|flatpak-global\|pacman-local\|pacman-global\|snap\)/$name" "$data" && continue
+		if [ -f "$flatpak_local/$name" ]; then
+			echo "flatpak-local/$name" >> "$data"
+		elif [ -f "$flatpak_global/$name" ]; then
+			echo "flatpak-global/$name" >> "$data"
+		elif [ -f "$pacman_local/$name" ]; then
+			echo "pacman-local/$name" >> "$data"
+		elif [ -f "$pacman_global/$name" ]; then
+			echo "pacman-global/$name" >> "$data"
+		elif [ -f "$snap/$name" ]; then
+			echo "snap/$name" >> "$data"
+		fi
+	done
+}
+
+fixfiles() {
+	lastmod=$(stat -c "%Y" "$data")
+	tmp="$(mktemp)"
+	trap 'rm $tmp' EXIT
+	[ -f "$data" ] && cp "$data" "$tmp" && copied='true'
+	lineno=0
+	[ "$copied" = 'true' ] && while IFS= read -r line; do
+		((lineno++))
+		name=${line#*/}
+		file="$user/$name"
+		# shellcheck disable=2015 # To disable shellcheck error here, line below is intended to work this way
+		echo "$line" | grep -xq '\(flatpak-local\|flatpak-global\|pacman-local\|pacman-global\|snap\)/.\+' && [ -f "$file" ] || { sed -i "${lineno}d" "$tmp" && ((lineno--)) ; continue; }
+		[ -f "$flatpak_local/$name" ] ||
+			[ -f "$flatpak_global/$name" ] ||
+			[ -f "$pacman_local/$name" ] ||
+			[ -f "$pacman_global/$name" ] ||
+			[ -f "$snap/$name" ] ||
+			{ mv "$file" "$file.bak" && echo "$line" >> "$data2"; }
+	done < "$data"
+
+	[ "$copied" = 'true' ] && [ "$(stat -c '%Y' "$data")" = "$lastmod" ] && sort "$tmp" | uniq > "$data"
+
+	[ -n "$(sort "$data2" | uniq -d)" ] && cp "$data2" "$tmp" && sort "$tmp" | uniq > "$data2"
+
+	for bakfile in "$user"/*.desktop.bak; do
+		origfile="${bakfile%.bak}"
+		[ -f "$origfile" ] && continue
+		name=$(basename "$origfile") || continue
+		[ -f "$flatpak_local/$name" ] ||
+			[ -f "$flatpak_global/$name" ] ||
+			[ -f "$pacman_local/$name" ] ||
+			[ -f "$pacman_global/$name" ] ||
+			[ -f "$snap/$name" ] &&
+			mv "$bakfile" "$origfile"
+	done
+}
+
+user_new=$(ls -ad "$user"/*.desktop 2>/dev/null)
+flatpak_local_new=$(ls -ad "$flatpak_local"/*.desktop 2>/dev/null)
+flatpak_global_new=$(ls -ad "$flatpak_global"/*.desktop 2>/dev/null)
+pacman_local_new=$(ls -ad "$pacman_local"/*.desktop 2>/dev/null)
+pacman_global_new=$(ls -ad "$pacman_global"/*.desktop 2>/dev/null)
+snap_new=$(ls -ad "$snap"/*.desktop 2>/dev/null)
+[ "$user_new" != "$user_old" ] && detectfiles
+[ "$flatpak_local_new" != "$flatpak_local_old" ] ||
+	[ "$flatpak_global_new" != "$flatpak_global_old" ] ||
+	[ "$pacman_local_new" != "$pacman_local_old" ] ||
+	[ "$pacman_global_new" != "$pacman_global_old" ] ||
+	[ "$snap_new" != "$snap_old" ] && fixfiles
+user_old=$user_new
+flatpak_local_old=$flatpak_local_new
+flatpak_global_old=$flatpak_global_new
+pacman_local_old=$pacman_local_new
+pacman_global_old=$pacman_global_new
+snap_old=$snap_new

bin/standalone/app-finder

@@ -0,0 +1,2 @@
+#!/bin/bash
+xdotool search --onlyvisible --class xfce4-appfinder windowkill || setsid -f xfce4-appfinder

bin/standalone/fix-chaotic-keyring

@@ -0,0 +1,3 @@
+#!/bin/bash
+sudo pacman-key --populate chaotic &
+rm ~/.local/bin/fix-chaotic-keyring

bin/standalone/reinstall-for-qt

@@ -0,0 +1,3 @@
+#!/bin/bash
+rm /var/lib/pacman/db.lck
+pacman --noconfirm -S qt5-styleplugins qt6gtk2

fixes-package.install

@@ -0,0 +1,3 @@
+post_install() {
+    systemctl enable fix-*.timer
+}

flatpak-overrides/global

@@ -0,0 +1,2 @@
+[Context]
+filesystems=~/.themes;

systemd/services/fix-flatpaks-theming.service

@@ -0,0 +1,13 @@
+# This service unit is for fix-flatpaks-theming script
+#
+
+[Unit]
+Description=Fix flatpak theming script
+Wants=fix-flatpaks-theming.timer
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/fix-flatpaks-theming
+
+[Install]
+WantedBy=multi-user.target

systemd/services/fix-theming.service

@@ -0,0 +1,13 @@
+# This service unit is for fix-theming script
+#
+
+[Unit]
+Description=Fix theming script
+Wants=fix-theming.timer
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/fix-theming
+
+[Install]
+WantedBy=multi-user.target

systemd/services/fix-tweaked-desktop-files.service

@@ -0,0 +1,13 @@
+# This service unit is for fix-tweaked-desktop-files script
+#
+
+[Unit]
+Description=Fix tweaked desktop files script
+Wants=fix-tweaked-desktop-files.timer
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/fix-tweaked-desktop-files
+
+[Install]
+WantedBy=multi-user.target

systemd/timers/fix-flatpaks-theming.timer

@@ -0,0 +1,14 @@
+# This timer unit is for fix-flatpaks-theming service unit
+#
+
+[Unit]
+Description=Run fix flatpaks theming script every 600 seconds
+Requires=fix-flatpaks-theming.service
+
+[Timer]
+Unit=fix-flatpaks-theming.service
+OnBootSec=1
+OnUnitActiveSec=600
+
+[Install]
+WantedBy=timers.target

systemd/timers/fix-theming.timer

@@ -0,0 +1,14 @@
+# This timer unit is for fix-theming service unit
+#
+
+[Unit]
+Description=Run fix theming script every 3 seconds
+Requires=fix-theming.service
+
+[Timer]
+Unit=fix-theming.service
+OnBootSec=1
+OnUnitActiveSec=3
+
+[Install]
+WantedBy=timers.target

systemd/timers/fix-tweaked-desktop-files.timer

@@ -0,0 +1,14 @@
+# This timer unit is for fix-tweaked-desktop-files service unit
+#
+
+[Unit]
+Description=Run fix tweaked desktop files script every 5 seconds
+Requires=fix-tweaked-desktop-files.service
+
+[Timer]
+Unit=ffix-tweaked-desktop-files.service
+OnBootSec=1
+OnUnitActiveSec=5
+
+[Install]
+WantedBy=timers.target