.pre-commit-config.yaml

@@ -58,7 +58,7 @@ repos:
     hooks:
       - id: mypy
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.15.1
+    rev: v3.15.0
     hooks:
       - id: pyupgrade
         args: [--py310-plus]

bash/flatpak-add-remotes.bash

@@ -7,7 +7,7 @@ set -x
 # set of remotes and are missing something existing on another
 flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo $@
 flatpak remote-add --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo $@
-#flatpak remote-add --if-not-exists kdeapps https://distribute.kde.org/kdeapps.flatpakrepo $@
+flatpak remote-add --if-not-exists kdeapps https://distribute.kde.org/kdeapps.flatpakrepo $@
 flatpak remote-add --if-not-exists nheko-nightly https://nheko.im/nheko-reborn/nheko/-/raw/master/nheko-nightly.flatpakrepo $@
 
 # Fedora?
@@ -23,16 +23,11 @@ flatpak remote-modify --enable fedora-testing $@
 # In case of similar issues on other distributions
 flatpak remote-modify --enable flathub $@
 flatpak remote-modify --enable flathub-beta $@
-#flatpak remote-modify --enable kdeapps $@
+flatpak remote-modify --enable kdeapps $@
 # The other repositories are very unlikely to ship by default with anything
 
-# These remotes no longer exist
-flatpak remote-delete kdeapps $@
-
 # Hints?
 printf 'Only want verified flatpaks? No problem!\n\tflatpak remote-modify --subset=verified flathub\n'
-printf 'kdeapps? https://userbase.kde.org/Tutorials/Flatpak#Nightly_KDE_apps\n'
-
 # Revert? ~/.local/share/flatpak/repo/config or /var/lib/flatpak/repo/config
 
 # Hide commands being executed again

bash/usr-local-bin/fluffychat

@@ -1,12 +1,14 @@
 #!/usr/bin/env bash
 
 # Flutter doesn't support flatpak, so Snap is the least bad Fluffy experience.
+# I presume repo version is always outdated, so fallback to flathub s less
+# bad.
 
 set -x
 if [ -f /snap/bin/fluffychat ]; then
-	# https://bugs.launchpad.net/ubuntu/+source/snapd/+bug/1951491/comments/104
-	unset DBUS_SESSION_BUS_ADDRESS
 	snap run fluffychat $@
+elif [ -f /var/lib/flatpak/exports/bin/im.fluffychat.Fluffychat ]; then
+	flatpak run im.fluffychat.Fluffychat $@
 else
 	/usr/bin/fluffychat
 fi

bash/usr-local-bin/vlc-snap

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-set -x
-if [ -f /snap/bin/vlc ]; then
-	# https://bugs.launchpad.net/ubuntu/+source/snapd/+bug/1951491/comments/105
-	export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus
-	snap run vlc $@
-else
-	/usr/bin/vlc
-fi
-set +x