From 630a3d4845180376524bfc8b69110535e1861bc3 Mon Sep 17 00:00:00 2001 From: bbedward Date: Mon, 3 Nov 2025 21:56:10 -0500 Subject: [PATCH] matugen: fix vscode light --- matugen/templates/vscode-color-theme.json | 1 - scripts/matugen-worker.sh | 12 ++++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/matugen/templates/vscode-color-theme.json b/matugen/templates/vscode-color-theme.json index b62c3194..02d224b7 100644 --- a/matugen/templates/vscode-color-theme.json +++ b/matugen/templates/vscode-color-theme.json @@ -1,7 +1,6 @@ { "$schema": "vscode://schemas/color-theme", "name": "Dynamic Base16 DankShell", - "type": "dark", "colors": { "editor.background": "{{colors.surface.default.hex}}", "editor.foreground": "{{colors.on_surface.default.hex}}", diff --git a/scripts/matugen-worker.sh b/scripts/matugen-worker.sh index 84e79f73..eb6482fb 100755 --- a/scripts/matugen-worker.sh +++ b/scripts/matugen-worker.sh @@ -283,7 +283,7 @@ EOF ;; esac fi - + rm -f "$TMP_CONTENT_CFG" popd >/dev/null @@ -402,10 +402,14 @@ EOF VSCODE_FINAL="$VSCODE_THEME_DIR/dankshell-${variant}.json" if [[ -f "$VSCODE_BASE" ]]; then - VARIANT_LIGHT="" - [[ "$variant" == "light" ]] && VARIANT_LIGHT="--light" + VARIANT_FLAG="" + if [[ "$variant" == "light" ]]; then + VARIANT_FLAG="--light" + elif [[ "$variant" == "default" && "$mode" == "light" ]]; then + VARIANT_FLAG="--light" + fi - dms dank16 "$PRIMARY" $VARIANT_LIGHT ${HONOR:+--honor-primary "$HONOR"} ${SURFACE:+--background "$SURFACE"} --vscode-enrich "$VSCODE_BASE" > "$VSCODE_FINAL" 2>/dev/null || cp "$VSCODE_BASE" "$VSCODE_FINAL" + dms dank16 "$PRIMARY" $VARIANT_FLAG ${HONOR:+--honor-primary "$HONOR"} ${SURFACE:+--background "$SURFACE"} --vscode-enrich "$VSCODE_BASE" > "$VSCODE_FINAL" 2>/dev/null || cp "$VSCODE_BASE" "$VSCODE_FINAL" fi done fi