fixes

Author: randogoth

files/system/etc/skel/.config/flameshot/flameshot.ini

@@ -3,14 +3,14 @@ useGrimAdapter=true
 autoCloseIdleDaemon=true
 startupLaunch=true
 saveAsFileExtension=jpg
-uiColor=#d0bcff
-contrastUiColor=#381e72
-drawColor=#d0bcff
-contrastOpacity=188
 uiLanguage=auto
 checkForUpdates=false
 disabledTrayIcon=true
 saveLastRegion=true
 showStartupLaunchMessage=false
 showAbortNotification=false
-showDesktopNotification=false
+showDesktopNotification=false
+uiColor=#d0bcff
+contrastUiColor=#381e72
+drawColor=#d0bcff
+contrastOpacity=188

files/system/usr/lib/systemd/user/dms.service

@@ -11,6 +11,7 @@ Environment=PATH=/usr/bin
 Environment=XDG_SESSION_TYPE=wayland
 Environment=XDG_CURRENT_DESKTOP=labwc
 Environment=QT_QPA_PLATFORM=wayland
+PassEnvironment=XDG_DATA_DIRS XDG_DATA_HOME XDG_CONFIG_HOME XDG_CACHE_HOME
 ExecStart=/usr/bin/dms run --session
 ExecReload=/usr/bin/pkill -USR1 -x dms
 Restart=always

files/system/usr/lib/systemd/user/flameshot-theme-update.service

@@ -4,7 +4,7 @@ After=graphical-session.target
 
 [Service]
 Type=oneshot
-ExecStart=/usr/libexec/dms/flameshot-theme-update.sh
+ExecStart=/bin/sh /usr/libexec/dms/flameshot-theme-update.sh
 
 [Install]
 WantedBy=default.target

files/system/usr/libexec/dms/flameshot-theme-update.sh

@@ -5,32 +5,50 @@ set -e
 config_dir="${XDG_CONFIG_HOME:-$HOME/.config}"
 colors_json="$HOME/.cache/DankMaterialShell/dms-colors.json"
 flameshot_ini="$config_dir/flameshot/flameshot.ini"
-
-[ -f "$colors_json" ] || exit 0
+skel_flameshot_ini="/etc/skel/.config/flameshot/flameshot.ini"
 
 mkdir -p "$(dirname "$flameshot_ini")"
 
+# Seed the user config from /etc/skel if it doesn't exist yet.
+if [ ! -f "$flameshot_ini" ] && [ -f "$skel_flameshot_ini" ]; then
+  cp "$skel_flameshot_ini" "$flameshot_ini"
+fi
+
+# Ensure we have a config file even if the skel copy is missing.
+if [ ! -f "$flameshot_ini" ]; then
+  cat > "$flameshot_ini" <<'EOF'
+[General]
+uiLanguage=auto
+EOF
+fi
+
+[ -f "$colors_json" ] || exit 0
+
 primary=$(jq -r '.colors.dark.primary // empty' "$colors_json")
 on_primary=$(jq -r '.colors.dark.on_primary // empty' "$colors_json")
-surface_variant=$(jq -r '.colors.dark.surface_variant // empty' "$colors_json")
 
 # Fallbacks if JSON fields are missing.
 [ -n "$primary" ] || primary="#d0bcff"
 [ -n "$on_primary" ] || on_primary="#381e72"
-[ -n "$surface_variant" ] || surface_variant="#49454e"
 
-cat > "$flameshot_ini" <<EOF
-[General]
-useGrimAdapter=true
-autoCloseIdleDaemon=true
-startupLaunch=true
-saveAsFileExtension=jpg
-# DMS-synced colors
-uiColor=${primary}
-contrastUiColor=${on_primary}
-drawColor=${primary}
-contrastOpacity=188
-uiLanguage=auto
-# Optional accent on selection/toolbar backgrounds
-buttonColor=${surface_variant}
-EOF
+python3 - "$flameshot_ini" "$primary" "$on_primary" <<'PY'
+import sys
+from configparser import ConfigParser
+
+ini_path, primary, on_primary = sys.argv[1:]
+config = ConfigParser(delimiters=('='), interpolation=None)
+config.optionxform = str
+config.read(ini_path, encoding="utf-8")
+
+if "General" not in config:
+    config["General"] = {}
+
+general = config["General"]
+general["uiColor"] = primary
+general["contrastUiColor"] = on_primary
+general["drawColor"] = primary
+general["contrastOpacity"] = "188"
+
+with open(ini_path, "w", encoding="utf-8") as f:
+    config.write(f, space_around_delimiters=False)
+PY

recipes/recipe.yml

@@ -70,8 +70,6 @@ modules:
         - ghostty
         - gnome-online-accounts-gtk
         - grim
-        - i2c-tools
-        - jq
         - khal
         - labwc
         - labwc-menu-generator
@@ -81,7 +79,6 @@ modules:
         - uv
         - waydroid
         - wayland-utils
-        - xdg-desktop-portal
         - xdg-desktop-portal-wlr
     remove:
       packages: