Fix Flatpak config loss: honour XDG base dirs

The app hardcoded ~/.config and ~/.cache. In the Flatpak that path is an
ephemeral tmpfs the sandbox wipes on exit (HOME stays /home/robert but the
real persistent store is $XDG_CONFIG_HOME = ~/.var/app/<id>/config). So
every setting, custom button, snippet and clipboard entry vanished on
restart, and disabling a recipe never held.

Add xdg_paths.py (reads XDG_CONFIG_HOME/XDG_CACHE_HOME/XDG_DATA_HOME with
the usual ~/.config etc. fallbacks) and route all per-user paths through
it. On a normal desktop nothing moves; in the Flatpak config now lands in
the persistent per-app dir. Bump to 0.9.4.

Author: GaimsDevSoftware

icon_picker.py

@@ -19,7 +19,9 @@
 gi.require_version("Gtk", "3.0")
 from gi.repository import GLib, Gtk  # noqa: E402
 
-USER_ICONS_DIR = Path(os.path.expanduser("~/.config/linuxpop/icons"))
+from xdg_paths import CONFIG_DIR  # noqa: E402
+
+USER_ICONS_DIR = CONFIG_DIR / "icons"
 HICOLOR_APPS = Path.home() / ".local/share/icons/hicolor/scalable/apps"
 
 # How many icons to render per "page". GTK FlowBox is fast enough that

main.py

@@ -39,13 +39,13 @@
 from platform_backend import get_backend
 from popup import PopupWindow
 from settings import get_settings
+from xdg_paths import CACHE_DIR, CONFIG_DIR
 
-__version__ = "0.9.3"
+__version__ = "0.9.4"
 
-CACHE_DIR = Path(os.path.expanduser("~/.cache/linuxpop"))
 LOG_FILE = CACHE_DIR / "linuxpop.log"
 LOCK_FILE = CACHE_DIR / "linuxpop.lock"
-FIRST_RUN_MARKER = Path(os.path.expanduser("~/.config/linuxpop/.first-run-done"))
+FIRST_RUN_MARKER = CONFIG_DIR / ".first-run-done"
 
 # Held for the lifetime of the process; the kernel releases the flock when
 # the fd is closed (i.e. when we exit, even ungracefully). Storing it at
@@ -724,8 +724,8 @@ def main(argv: list[str] | None = None) -> int:
         # curated default bundle from a clean state.
         for marker in (
             FIRST_RUN_MARKER,
-            Path(os.path.expanduser("~/.config/linuxpop/.default-plugins-seeded")),
-            Path(os.path.expanduser("~/.config/linuxpop/.default-recipes-seeded")),
+            CONFIG_DIR / ".default-plugins-seeded",
+            CONFIG_DIR / ".default-recipes-seeded",
         ):
             try:
                 marker.unlink(missing_ok=True)

mcp_server.py

@@ -42,13 +42,16 @@
 import sys
 from pathlib import Path
 
+sys.path.insert(0, str(Path(__file__).resolve().parent))
+from xdg_paths import CACHE_DIR, CONFIG_DIR  # noqa: E402
+
 PROTOCOL_VERSION = "2024-11-05"
 SERVER_NAME = "linuxpop"
-SERVER_VERSION = "0.9.3"
+SERVER_VERSION = "0.9.4"
 
 # Log to a file so the user can debug without stdout-noise corrupting
 # the JSON-RPC stream the MCP client is reading.
-_LOG_DIR = Path(os.path.expanduser("~/.cache/linuxpop"))
+_LOG_DIR = CACHE_DIR
 _LOG_DIR.mkdir(parents=True, exist_ok=True)
 logging.basicConfig(
     filename=str(_LOG_DIR / "mcp.log"),
@@ -109,8 +112,7 @@ def _read_json(path: Path):
 def tool_get_clipboard_history(args: dict) -> dict:
     limit = int((args or {}).get("limit", 25))
     limit = max(1, min(limit, 200))
-    history_path = Path(os.path.expanduser(
-        "~/.cache/linuxpop/clipboard/history.json"))
+    history_path = CACHE_DIR / "clipboard" / "history.json"
     raw = _read_json(history_path) or []
     items = []
     for entry in raw[:limit]:
@@ -128,8 +130,7 @@ def tool_get_clipboard_history(args: dict) -> dict:
 
 
 def tool_list_snippets(_args: dict) -> dict:
-    snippets_path = Path(os.path.expanduser(
-        "~/.config/linuxpop/snippets.json"))
+    snippets_path = CONFIG_DIR / "snippets.json"
     raw = _read_json(snippets_path) or []
     items = []
     for entry in raw:
@@ -149,8 +150,7 @@ def tool_expand_snippet(args: dict) -> dict:
     name = (args or {}).get("name", "")
     if not name:
         raise ValueError("'name' is required")
-    snippets_path = Path(os.path.expanduser(
-        "~/.config/linuxpop/snippets.json"))
+    snippets_path = CONFIG_DIR / "snippets.json"
     snippets = _read_json(snippets_path) or []
     match = None
     for s in snippets:
@@ -168,7 +168,7 @@ def tool_expand_snippet(args: dict) -> dict:
 
 
 def tool_list_recipes(_args: dict) -> dict:
-    recipes_dir = Path(os.path.expanduser("~/.config/linuxpop/recipes"))
+    recipes_dir = CONFIG_DIR / "recipes"
     items = []
     if recipes_dir.is_dir():
         for f in sorted(recipes_dir.glob("*.json")):

packaging/io.github.GaimsDevSoftware.LinuxPop.metainfo.xml

@@ -96,6 +96,15 @@
   <content_rating type="oars-1.1" />
 
   <releases>
+    <release version="0.9.4" date="2026-06-15">
+      <description>
+        <p>Your settings finally stick. In the Flatpak build the app was saving
+        its settings, custom buttons, snippets and clipboard history to a
+        temporary folder that the sandbox wiped on every restart, so things like
+        switching off a search button never held. It now writes to its own
+        permanent folder, so whatever you change stays changed.</p>
+      </description>
+    </release>
     <release version="0.9.3" date="2026-06-15">
       <description>
         <p>Flatpak: screen OCR is back (bundled tesseract + Screenshot portal);

plugin_loader.py

@@ -17,10 +17,11 @@
 import actions
 from classifier import ContentType
 from plugin_base import Plugin
+from xdg_paths import CONFIG_DIR
 
 _PLUGINS: List[Plugin] = []
 
-USER_PLUGIN_DIR = Path(os.path.expanduser("~/.config/linuxpop/plugins"))
+USER_PLUGIN_DIR = CONFIG_DIR / "plugins"
 LINUXPOP_DIR = str(Path(__file__).resolve().parent)
 REPO_PLUGIN_DIR = Path(LINUXPOP_DIR) / "plugins_repo"
 ICONS_DIR = Path(LINUXPOP_DIR) / "icons"

plugin_manager.py

@@ -7,6 +7,8 @@
 from pathlib import Path
 from typing import Callable
 
+from xdg_paths import CONFIG_DIR
+
 import gi
 
 gi.require_version("Gtk", "3.0")
@@ -154,8 +156,8 @@ def _force_to_front(window: Gtk.Window) -> None:
             pass
 
 REPO_DIR = Path(__file__).resolve().parent / "plugins_repo"
-USER_PLUGIN_DIR = Path(os.path.expanduser("~/.config/linuxpop/plugins"))
-USER_RECIPE_DIR = Path(os.path.expanduser("~/.config/linuxpop/recipes"))
+USER_PLUGIN_DIR = CONFIG_DIR / "plugins"
+USER_RECIPE_DIR = CONFIG_DIR / "recipes"
 
 
 def _target_dir(entry: dict) -> Path:

plugins_repo/clipboard_history.py

@@ -128,9 +128,11 @@ def _poll_interval() -> float:
 CAPTURE_IMAGES = _capture_images()
 POLL_INTERVAL = _poll_interval()
 
-CACHE_DIR = Path(os.path.expanduser("~/.cache/linuxpop/clipboard"))
+from xdg_paths import CACHE_DIR as _LP_CACHE, CONFIG_DIR as _LP_CONFIG
+
+CACHE_DIR = _LP_CACHE / "clipboard"
 HISTORY_FILE = CACHE_DIR / "history.json"
-SNIPPETS_FILE = Path(os.path.expanduser("~/.config/linuxpop/snippets.json"))
+SNIPPETS_FILE = _LP_CONFIG / "snippets.json"
 IMAGES_DIR = CACHE_DIR / "images"
 
 

plugins_repo/qr_code.py

@@ -13,8 +13,9 @@
 
 from classifier import ContentType
 from plugin_base import Plugin
+from xdg_paths import CACHE_DIR
 
-QR_CACHE = Path(os.path.expanduser("~/.cache/linuxpop/qr"))
+QR_CACHE = CACHE_DIR / "qr"
 MAX_CACHED = 20
 
 

recipe_loader.py

@@ -30,8 +30,9 @@
 
 from classifier import ContentType
 from plugin_base import Plugin
+from xdg_paths import CONFIG_DIR
 
-RECIPES_DIR = Path(os.path.expanduser("~/.config/linuxpop/recipes"))
+RECIPES_DIR = CONFIG_DIR / "recipes"
 
 _CTYPE_BY_NAME = {
     "plain_text": ContentType.PLAIN_TEXT,

settings.py

@@ -11,7 +11,8 @@
 from pathlib import Path
 from typing import Any
 
-CONFIG_DIR = Path(os.path.expanduser("~/.config/linuxpop"))
+from xdg_paths import CONFIG_DIR
+
 CONFIG_PATH = CONFIG_DIR / "settings.json"
 
 DEFAULTS: dict[str, Any] = {