flatpak-workarounds.bash: split long oneliners since scripts don't need oneliners

.gitmodules

@@ -2,11 +2,17 @@
 	path = submodules/gist
 	url = https://gitea.blesmrt.net/mikaela/gist.git
 	branch = master
+	ignore = dirty
+	shallow = true
 [submodule "submodules/PPFI-Pikaviestimet"]
 	path = submodules/PPFI-Pikaviestimet
 	url = https://git.piraattipuolue.fi/Pikaviestimet/Pikaviestimet.git
 	branch = master
+	ignore = dirty
+	shallow = true
 [submodule "submodules/shell-things"]
 	path = submodules/shell-things
 	url = https://codeberg.org/Aminda/shell-things.git
 	branch = cxefa
+	ignore = dirty
+	shallow = true

.pre-commit-config.yaml

@@ -87,7 +87,7 @@ repos:
         language: system
 
   - repo: https://github.com/editorconfig-checker/editorconfig-checker.python
-    rev: "3.2.0"
+    rev: "3.2.1"
     hooks:
       - id: editorconfig-checker
         alias: ec

Gemfile.lock

@@ -5,9 +5,9 @@ GEM
       temple (>= 0.8.2)
       thor
       tilt
-    logger (1.6.6)
+    logger (1.7.0)
     prettier_print (1.2.1)
-    rbs (3.8.1)
+    rbs (3.9.2)
       logger
     syntax_tree (6.2.0)
       prettier_print (>= 1.2.0)

bash/flatpak-workarounds.bash

@@ -8,27 +8,45 @@ set -x
 # Reserved directories that cannot be shared
 # to flatpaks include at least: /usr
 
+# NOTE! Multiple overrides can be set in one command (just pass the --flag
+# multiple times), but for the sake of legibility and un/commenting this
+# isn't done within this script.
+
 # Overrides for all apps improving Quality of Life
 # - debugging with gdb
 # - curl configuration following
 # - text editor configuration
 # - user-specific fonts
-flatpak override --filesystem=~/.gdbinit:ro --filesystem=~/gdb.txt:rw --filesystem=~/.curlrc:ro --filesystem=~/.editorconfig:ro --filesystem=~/.local/share/fonts:ro $@
+flatpak override --filesystem=~/.gdbinit:ro $@
+flatpak override --filesystem=~/gdb.txt:rw $@
+flatpak override --filesystem=~/.curlrc:ro $@
+flatpak override --filesystem=~/.editorconfig:ro $@
+flatpak override --filesystem=~/.local/share/fonts:ro $@
 
 # Public git repositories I access or symlink much.
-# Must be rw for access by text editors, otherwise they are ro or I will repeat myself
-flatpak override --filesystem=~/.shell-things:rw --filesystem=~/src/gitea.blesmrt.net/Mikaela/shell-things:rw --filesystem=~/src/gitea.blesmrt.net/Mikaela/gist:rw --filesystem=~/src/gitea.blesmrt.net/Mikaela/scripts:rw --filesystem=~/src/github.com/Mikaela/mikaela.github.io:rw $@
+# Must be rw for access by text editors, otherwise they are ro, or I will repeat myself
+#flatpak override --filesystem=~/.shell-things:rw $@
+flatpak override --filesystem=~/src/codeberg.org/Aminda/shell-things:rw $@
+flatpak override --filesystem=~/src/gitea.blesmrt.net/Mikaela/shell-things:rw $@
+flatpak override --filesystem=~/src/gitea.blesmrt.net/Mikaela/gist:rw $@
+flatpak override --filesystem=~/src/gitea.blesmrt.net/Mikaela/scripts:rw $@
+flatpak override --filesystem=~/src/github.com/Mikaela/mikaela.github.io:rw $@
 
 # EXPERIMENT! All apps may use wayland (sandboxed) and downgrade to
 # X11/xwayland only if current desktop doesn't support wayland.
 # SECURITY! May let untrusted apps spy on everything on X11 desktops, but
-# I either don't have those around or Fedora 40 removes them with the new KDE
-# Plasma. NOTE: fallback-x11 should override x11 socket permission.
-flatpak override --socket=wayland --socket=fallback-x11 --nosocket=x11 --env=ELECTRON_OZONE_PLATFORM_HINT=auto $@
+# I either don't have those around or Fedora 40 removes them with the new
+# KDE Plasma. NOTE: fallback-x11 has deprecated and overrides x11 socket
+# permission.
+flatpak override --socket=wayland $@
+flatpak override --socket=fallback-x11 $@
+flatpak override --nosocket=x11 $@
+flatpak override --env=ELECTRON_OZONE_PLATFORM_HINT=auto $@
 
 # Backticks and a lot of common characters in all Flatpaks
 # https://github.com/flatpak/flatpak/issues/2031
-flatpak override --talk-name=org.fcitx.Fcitx --talk-name=org.freedesktop.portal.Fcitx $@
+flatpak override --talk-name=org.fcitx.Fcitx $@
+flatpak override --talk-name=org.freedesktop.portal.Fcitx $@
 # Darkman automatic theme switching
 flatpak override --talk-name=org.freedesktop.impl.portal.desktop.darkman $@
 
@@ -36,16 +54,22 @@ flatpak override --talk-name=org.freedesktop.impl.portal.desktop.darkman $@
 flatpak override --env=FLATPAK_ENABLE_SDK_EXT=texlive,dotnet,golang $@
 
 # I don't have other nvim on SteamOS
-flatpak override io.neovim.nvim --filesystem=host --filesystem=host-os --filesystem=host-etc $@
+flatpak override io.neovim.nvim --filesystem=host $@
+flatpak override io.neovim.nvim --filesystem=host-os $@
+flatpak override io.neovim.nvim --filesystem=host-etc $@
 
 # https://github.com/flathub/org.briarproject.Briar/issues/5
-flatpak override org.briarproject.Briar --filesystem=~/.briar:create --filesystem=~/.java/.userPrefs/org/briarproject/briar:create --nosocket=fallback-x11 --socket=x11 $@
+flatpak override org.briarproject.Briar --filesystem=~/.briar:create $@
+flatpak override org.briarproject.Briar --filesystem=~/.java/.userPrefs/org/briarproject/briar:create $@
+flatpak override org.briarproject.Briar --nosocket=fallback-x11 $@
+flatpak override org.briarproject.Briar --socket=x11 $@
 
 # Directory I have normal Nextcloud in
 flatpak override com.nextcloud.desktopclient.nextcloud --filesystem=~/Nextcloud:create $@
 
 # PCSX2 files
-flatpak override net.pcsx2.PCSX2 --filesystem=~/.config/PCSX2:create --filesystem=~/PS2:create $@
+flatpak override net.pcsx2.PCSX2 --filesystem=~/.config/PCSX2:create $@
+flatpak override net.pcsx2.PCSX2 --filesystem=~/PS2:create $@
 
 # A directory I can share between native and flatpak Steam so both have the
 # same games without having to navigate weird paths.
@@ -65,7 +89,11 @@ flatpak override me.kozec.syncthingtk --filesystem=~/.config/syncthing:create $@
 flatpak override --filesystem=/run/udev:ro com.microsoft.Edge $@
 
 # Mosh starts by opening an SSH connection and thus it needs to at least read my SSH config. Seeing new keys probably needs rw to known_hosts and as I use sockets, they may need rw. Then there is my config.d being in a private git repo...
-flatpak override --filesystem=~/.ssh/config:ro --filesystem=~/.ssh/config.d:ro --filesystem=~/.ssh/known_hosts:rw --filesystem=~/.ssh/sockets:rw --filesystem=~/src/gitea.blesmrt.net/Mikaela/privgist/ssh/config.d:ro org.mosh.mosh $@
+flatpak override org.mosh.mosh --filesystem=~/.ssh/config:ro $@
+flatpak override org.mosh.mosh --filesystem=~/.ssh/config.d:ro $@
+flatpak override org.mosh.mosh --filesystem=~/.ssh/known_hosts:rw $@
+flatpak override org.mosh.mosh --filesystem=~/.ssh/sockets:rw $@
+flatpak override org.mosh.mosh --filesystem=~/src/gitea.blesmrt.net/Mikaela/privgist/ssh/config.d:ro $@
 
 # Apparently Element needs this talk for encrypted search
 # https://github.com/flathub/im.riot.Riot/issues/303#issuecomment-1816055123
@@ -76,7 +104,9 @@ flatpak override im.riot.Riot --talk-name=org.freedesktop.secrets $@
 flatpak override org.squidowl.halloy --filesystem=~/snap/halloy:create $@
 
 # Hardening GearLever, https://github.com/mijorus/gearlever/issues/143
-flatpak override it.mijorus.gearlever --nofilesystem=host:reset --filesystem=~/.local/share/applications:create --filesystem=~/AppImages:create
+flatpak override it.mijorus.gearlever --nofilesystem=host:reset $@
+flatpak override it.mijorus.gearlever --filesystem=~/.local/share/applications:create $@
+flatpak override it.mijorus.gearlever --filesystem=~/AppImages:create $@
 
 # Display the overrides
 if [ -d /var/lib/flatpak/overrides/ ]; then

package.json

@@ -1,14 +1,14 @@
 {
   "devDependencies": {
-    "@aminda/global-prettier-config": "2025.13.0",
+    "@aminda/global-prettier-config": "2025.15.0",
     "@prettier/plugin-ruby": "4.0.4",
     "@prettier/plugin-xml": "3.4.1",
     "corepack": "latest",
     "prettier": "3.5.3",
     "prettier-plugin-nginx": "1.0.3",
-    "prettier-plugin-sh": "0.15.0",
-    "prettier-plugin-toml": "2.0.2"
+    "prettier-plugin-sh": "0.17.1",
+    "prettier-plugin-toml": "2.0.4"
   },
-  "packageManager": "pnpm@10.6.5+sha512.cdf928fca20832cd59ec53826492b7dc25dc524d4370b6b4adbf65803d32efaa6c1c88147c0ae4e8d579a6c9eec715757b50d4fa35eea179d868eada4ed043af",
+  "packageManager": "pnpm@10.8.0+sha512.0e82714d1b5b43c74610193cb20734897c1d00de89d0e18420aebc5977fa13d780a9cb05734624e81ebd81cc876cd464794850641c48b9544326b5622ca29971",
   "prettier": "@aminda/global-prettier-config"
 }

pnpm-lock.yaml

@@ -8,8 +8,8 @@ importers:
   .:
     devDependencies:
       "@aminda/global-prettier-config":
-        specifier: 2025.13.0
-        version: 2025.13.0
+        specifier: 2025.15.0
+        version: 2025.15.0
       "@prettier/plugin-ruby":
         specifier: 4.0.4
         version: 4.0.4(prettier@3.5.3)
@@ -26,17 +26,17 @@ importers:
         specifier: 1.0.3
         version: 1.0.3
       prettier-plugin-sh:
-        specifier: 0.15.0
-        version: 0.15.0(prettier@3.5.3)
+        specifier: 0.17.1
+        version: 0.17.1(prettier@3.5.3)
       prettier-plugin-toml:
-        specifier: 2.0.2
-        version: 2.0.2(prettier@3.5.3)
+        specifier: 2.0.4
+        version: 2.0.4(prettier@3.5.3)
 
 packages:
-  "@aminda/global-prettier-config@2025.13.0":
+  "@aminda/global-prettier-config@2025.15.0":
     resolution:
       {
-        integrity: sha512-1yRmlX7lrBu41eu7dcAF17fTYdbnTYp6o1zRKGUVku6ddz9rp0cjCw4QK1oNrUq7KU0GAAlxQtDfw0WlOzJw+A==,
+        integrity: sha512-KFBpY4OaIUZRWBGN/6iJlEZkV6mrq+jHJnqz1tpuMfnR5c0Rx27EmHirsg/WdEUKbt/33OPUDiLV/BcbB3Ak8Q==,
       }
 
   "@prettier/plugin-ruby@4.0.4":
@@ -55,16 +55,22 @@ packages:
     peerDependencies:
       prettier: ^3.0.0
 
-  "@taplo/core@0.1.1":
+  "@reteps/dockerfmt@0.2.6":
     resolution:
       {
-        integrity: sha512-BG/zLGf5wiNXGEVPvUAAX/4ilB3PwDUY2o0MV0y47mZbDZ9ad9UK/cIQsILat3bqbPJsALVbU6k3cskNZ3vAQg==,
+        integrity: sha512-a3OYxLpIc6jbW1prbruEhRq9eYre9fKhcBD+boVwhri9L9ebdnKNy4LzaDa/tiu81P9phxA6Xi8r6jtV8I7Xsw==,
       }
 
-  "@taplo/lib@0.4.0-alpha.2":
+  "@taplo/core@0.2.0":
     resolution:
       {
-        integrity: sha512-DV/Re3DPVY+BhBtLZ3dmP4mP6YMLSsgq9qGLXwOV38lvNF/fBlgvQswzlXmzCEefL/3q2eMoefZpOI/+GLuCNA==,
+        integrity: sha512-r8bl54Zj1In3QLkiW/ex694bVzpPJ9EhwqT9xkcUVODnVUGirdB1JTsmiIv0o1uwqZiwhi8xNnTOQBRQCpizrQ==,
+      }
+
+  "@taplo/lib@0.5.0":
+    resolution:
+      {
+        integrity: sha512-+xIqpQXJco3T+VGaTTwmhxLa51qpkQxCjRwezjFZgr+l21ExlywJFcDfTrNmL6lG6tqb0h8GyJKO3UPGPtSCWg==,
       }
 
   "@xml-tools/parser@1.0.11":
@@ -87,31 +93,25 @@ packages:
     engines: { node: ^18.17.1 || ^20.10.0 || >=22.11.0 }
     hasBin: true
 
-  mvdan-sh@0.10.1:
-    resolution:
-      {
-        integrity: sha512-kMbrH0EObaKmK3nVRKUIIya1dpASHIEusM13S4V1ViHFuxuNxCo+arxoa6j/dbV22YBGjl7UKJm9QQKJ2Crzhg==,
-      }
-
   prettier-plugin-nginx@1.0.3:
     resolution:
       {
         integrity: sha512-vV5q85s8XnV6NEgvz1gVLfZhmxAxY03MyOYj2ApBpjFkbs00lRsRkTmqO9L39ADuD18z1RRCcfZ3eVxKhI/nqg==,
       }
 
-  prettier-plugin-sh@0.15.0:
+  prettier-plugin-sh@0.17.1:
     resolution:
       {
-        integrity: sha512-U0PikJr/yr2bzzARl43qI0mApBj0C1xdAfA04AZa6LnvIKawXHhuy2fFo6LNA7weRzGlAiNbaEFfKMFo0nZr/A==,
+        integrity: sha512-jbrB7MRlmgtSRx2+I3McQGdFb98VUtJTkQ5DiK6oSJSfCy6vSBxSsuyDZ1xIx13TqREUHTsMzlNrZBZScuJJXQ==,
       }
     engines: { node: ">=16.0.0" }
     peerDependencies:
       prettier: ^3.0.3
 
-  prettier-plugin-toml@2.0.2:
+  prettier-plugin-toml@2.0.4:
     resolution:
       {
-        integrity: sha512-tUIIhyfdVX5DMsLGKX/2qaEwi3W48OkUSR7XC91PRI5jFzhexmaYWkrSP1Xh/eWUcEc0TVMQenM3lB09xLQstQ==,
+        integrity: sha512-uOTNPClqnE3T9XJ8hCqAJek70Jnk3/ZuAG/aXRTmrWbVe8lJyuZ60KV7OtgWqF+iGZOPVpkh+giHhX9GZYRHGA==,
       }
     engines: { node: ">=16.0.0" }
     peerDependencies:
@@ -131,10 +131,10 @@ packages:
         integrity: sha512-tlbJqcMHnPKI9zSrystikWKwHkBqu2a/Sgw01h3zFjvYrMxEDYHzzoMZnUrbIfpTFEsoRnnviOXNCzFiSc54Qw==,
       }
 
-  sh-syntax@0.4.2:
+  sh-syntax@0.5.6:
     resolution:
       {
-        integrity: sha512-/l2UZ5fhGZLVZa16XQM9/Vq/hezGGbdHeVEA01uWjOL1+7Ek/gt6FquW0iKKws4a9AYPYvlz6RyVvjh3JxOteg==,
+        integrity: sha512-hUprXSSgi3HLdIxufSsr0lceThj6vKsgOHcVVGujDGLWg9RD5Mt6j2m642qkTAU/7GFX65ed/g9h2jeURGuTlQ==,
       }
     engines: { node: ">=16.0.0" }
 
@@ -145,15 +145,15 @@ packages:
       }
 
 snapshots:
-  "@aminda/global-prettier-config@2025.13.0":
+  "@aminda/global-prettier-config@2025.15.0":
     dependencies:
       "@prettier/plugin-ruby": 4.0.4(prettier@3.5.3)
       "@prettier/plugin-xml": 3.4.1(prettier@3.5.3)
       corepack: 0.32.0
       prettier: 3.5.3
       prettier-plugin-nginx: 1.0.3
-      prettier-plugin-sh: 0.15.0(prettier@3.5.3)
-      prettier-plugin-toml: 2.0.2(prettier@3.5.3)
+      prettier-plugin-sh: 0.17.1(prettier@3.5.3)
+      prettier-plugin-toml: 2.0.4(prettier@3.5.3)
 
   "@prettier/plugin-ruby@4.0.4(prettier@3.5.3)":
     dependencies:
@@ -164,11 +164,13 @@ snapshots:
       "@xml-tools/parser": 1.0.11
       prettier: 3.5.3
 
-  "@taplo/core@0.1.1": {}
+  "@reteps/dockerfmt@0.2.6": {}
 
-  "@taplo/lib@0.4.0-alpha.2":
+  "@taplo/core@0.2.0": {}
+
+  "@taplo/lib@0.5.0":
     dependencies:
-      "@taplo/core": 0.1.1
+      "@taplo/core": 0.2.0
 
   "@xml-tools/parser@1.0.11":
     dependencies:
@@ -180,26 +182,24 @@ snapshots:
 
   corepack@0.32.0: {}
 
-  mvdan-sh@0.10.1: {}
-
   prettier-plugin-nginx@1.0.3: {}
 
-  prettier-plugin-sh@0.15.0(prettier@3.5.3):
+  prettier-plugin-sh@0.17.1(prettier@3.5.3):
     dependencies:
-      mvdan-sh: 0.10.1
+      "@reteps/dockerfmt": 0.2.6
       prettier: 3.5.3
-      sh-syntax: 0.4.2
+      sh-syntax: 0.5.6
 
-  prettier-plugin-toml@2.0.2(prettier@3.5.3):
+  prettier-plugin-toml@2.0.4(prettier@3.5.3):
     dependencies:
-      "@taplo/lib": 0.4.0-alpha.2
+      "@taplo/lib": 0.5.0
       prettier: 3.5.3
 
   prettier@3.5.3: {}
 
   regexp-to-ast@0.5.0: {}
 
-  sh-syntax@0.4.2:
+  sh-syntax@0.5.6:
     dependencies:
       tslib: 2.8.1