matugen: update vscode template

- yaml/toml highlighting colors
- fix scrollbar contrast
- fix command-search marker

quickshell/matugen/templates/vscode-color-theme-dark.json

@@ -67,6 +67,7 @@
     "list.focusOutline": "{{colors.primary.dark.hex}}",
     "list.focusBackground": "{{colors.surface_container_high.dark.hex}}",
     "list.highlightForeground": "{{colors.primary.dark.hex}}",
+    "list.focusHighlightForeground": "{{colors.on_primary.dark.hex}}",
     "list.errorForeground": "{{colors.error.dark.hex}}",
     "list.warningForeground": "{{colors.secondary.dark.hex}}",
     //
@@ -162,9 +163,9 @@
     //
     // Scrollbar
     //
-    "scrollbarSlider.background": "{{colors.outline.dark.hex}}40",
+    "scrollbarSlider.background": "{{colors.on_surface_variant.dark.hex}}50",
-    "scrollbarSlider.hoverBackground": "{{colors.outline.dark.hex}}60",
+    "scrollbarSlider.hoverBackground": "{{colors.on_surface_variant.dark.hex}}80",
-    "scrollbarSlider.activeBackground": "{{colors.outline.dark.hex}}80",
+    "scrollbarSlider.activeBackground": "{{colors.on_surface_variant.dark.hex}}AA",
     //
     // Terminal (Dank16)
     //
@@ -192,79 +193,107 @@
   //
   "tokenColors": [
     {
-      "scope": [
+      "scope": ["comment"],
-        "comment"
-      ],
       "settings": {
         "foreground": "{{dank16.color8.dark.hex}}"
       }
     },
     {
-      "scope": [
+      "scope": ["keyword"],
-        "keyword"
-      ],
       "settings": {
         "foreground": "{{dank16.color5.dark.hex}}"
       }
     },
     {
-      "scope": [
+      "scope": ["string"],
-        "string"
-      ],
       "settings": {
         "foreground": "{{dank16.color3.dark.hex}}"
       }
     },
     {
-      "scope": [
+      "scope": ["constant", "constant.language", "constant.numeric"],
-        "constant",
-        "number"
-      ],
       "settings": {
         "foreground": "{{dank16.color12.dark.hex}}"
       }
     },
     {
-      "scope": [
+      "scope": ["variable"],
-        "variable"
-      ],
       "settings": {
         "foreground": "{{dank16.color15.dark.hex}}"
       }
     },
     {
-      "scope": [
+      "scope": ["entity.name.function"],
-        "entity.name.function"
-      ],
       "settings": {
         "foreground": "{{dank16.color2.dark.hex}}"
       }
     },
     {
-      "scope": [
+      "scope": ["entity.name.class", "support.type"],
-        "entity.name.class",
-        "support.type"
-      ],
       "settings": {
         "foreground": "{{dank16.color12.dark.hex}}"
       }
     },
     {
-      "scope": [
+      "scope": ["invalid"],
-        "invalid"
-      ],
       "settings": {
         "foreground": "{{colors.error.dark.hex}}"
       }
     },
     {
-      "scope": [
+      "scope": ["markup.heading"],
-        "markup.heading"
-      ],
       "settings": {
         "foreground": "{{colors.primary.dark.hex}}",
         "fontStyle": "bold"
       }
+    },
+    {
+      "scope": ["entity.name.tag.yaml", "punctuation.definition.block.sequence.item.yaml"],
+      "settings": {
+        "foreground": "{{colors.on_surface.dark.hex}}"
+      }
+    },
+    {
+      "scope": ["source.yaml string.unquoted", "source.yaml string.quoted"],
+      "settings": {
+        "foreground": "{{dank16.color3.dark.hex}}"
+      }
+    },
+    {
+      "scope": ["constant.language.boolean.yaml", "constant.language.null.yaml"],
+      "settings": {
+        "foreground": "{{dank16.color12.dark.hex}}"
+      }
+    },
+    {
+      "scope": ["punctuation.separator.key-value.mapping.yaml"],
+      "settings": {
+        "foreground": "{{colors.on_surface.dark.hex}}"
+      }
+    },
+    {
+      "scope": ["entity.name.tag.toml", "support.type.property-name.toml"],
+      "settings": {
+        "foreground": "{{colors.on_surface.dark.hex}}"
+      }
+    },
+    {
+      "scope": ["string.quoted.single.basic.line.toml", "string.quoted.double.basic.line.toml"],
+      "settings": {
+        "foreground": "{{dank16.color3.dark.hex}}"
+      }
+    },
+    {
+      "scope": ["constant.language.boolean.toml", "constant.numeric.toml"],
+      "settings": {
+        "foreground": "{{dank16.color12.dark.hex}}"
+      }
+    },
+    {
+      "scope": ["meta.object-literal.key", "support.type.property-name.json"],
+      "settings": {
+        "foreground": "{{colors.on_surface.dark.hex}}"
+      }
     }
   ],
   //

quickshell/matugen/templates/vscode-color-theme-default.json

@@ -49,6 +49,7 @@
     "list.focusOutline": "{{colors.primary.default.hex}}",
     "list.focusBackground": "{{colors.surface_container_high.default.hex}}",
     "list.highlightForeground": "{{colors.primary.default.hex}}",
+    "list.focusHighlightForeground": "{{colors.on_primary.default.hex}}",
     "list.errorForeground": "{{colors.error.default.hex}}",
     "list.warningForeground": "{{colors.secondary.default.hex}}",
     "input.background": "{{colors.surface_container_low.default.hex}}",
@@ -114,9 +115,9 @@
     "editorSuggestWidget.foreground": "{{colors.on_surface.default.hex}}",
     "editorSuggestWidget.selectedBackground": "{{colors.surface_container_high.default.hex}}",
     "editorSuggestWidget.highlightForeground": "{{colors.primary.default.hex}}",
-    "scrollbarSlider.background": "{{colors.outline.default.hex}}40",
+    "scrollbarSlider.background": "{{colors.on_surface_variant.default.hex}}50",
-    "scrollbarSlider.hoverBackground": "{{colors.outline.default.hex}}60",
+    "scrollbarSlider.hoverBackground": "{{colors.on_surface_variant.default.hex}}80",
-    "scrollbarSlider.activeBackground": "{{colors.outline.default.hex}}80",
+    "scrollbarSlider.activeBackground": "{{colors.on_surface_variant.default.hex}}AA",
     "terminal.background": "{{colors.background.default.hex}}",
     "terminal.foreground": "{{colors.on_surface.default.hex}}",
     "terminal.ansiBlack": "{{dank16.color0.default.hex}}",
@@ -138,79 +139,107 @@
   },
   "tokenColors": [
     {
-      "scope": [
+      "scope": ["comment"],
-        "comment"
-      ],
       "settings": {
         "foreground": "{{colors.outline.default.hex}}"
       }
     },
     {
-      "scope": [
+      "scope": ["keyword"],
-        "keyword"
-      ],
       "settings": {
         "foreground": "{{dank16.color5.default.hex}}"
       }
     },
     {
-      "scope": [
+      "scope": ["string"],
-        "string"
-      ],
       "settings": {
         "foreground": "{{dank16.color2.default.hex}}"
       }
     },
     {
-      "scope": [
+      "scope": ["constant", "constant.language", "constant.numeric"],
-        "constant",
-        "number"
-      ],
       "settings": {
         "foreground": "{{dank16.color12.default.hex}}"
       }
     },
     {
-      "scope": [
+      "scope": ["variable"],
-        "variable"
-      ],
       "settings": {
         "foreground": "{{colors.on_surface.default.hex}}"
       }
     },
     {
-      "scope": [
+      "scope": ["entity.name.function"],
-        "entity.name.function"
-      ],
       "settings": {
         "foreground": "{{dank16.color4.default.hex}}"
       }
     },
     {
-      "scope": [
+      "scope": ["entity.name.class", "support.type"],
-        "entity.name.class",
-        "support.type"
-      ],
       "settings": {
         "foreground": "{{colors.secondary.default.hex}}"
       }
     },
     {
-      "scope": [
+      "scope": ["invalid"],
-        "invalid"
-      ],
       "settings": {
         "foreground": "{{colors.error.default.hex}}"
       }
     },
     {
-      "scope": [
+      "scope": ["markup.heading"],
-        "markup.heading"
-      ],
       "settings": {
         "foreground": "{{colors.primary.default.hex}}",
         "fontStyle": "bold"
       }
+    },
+    {
+      "scope": ["entity.name.tag.yaml", "punctuation.definition.block.sequence.item.yaml"],
+      "settings": {
+        "foreground": "{{colors.on_surface.default.hex}}"
+      }
+    },
+    {
+      "scope": ["source.yaml string.unquoted", "source.yaml string.quoted"],
+      "settings": {
+        "foreground": "{{dank16.color3.default.hex}}"
+      }
+    },
+    {
+      "scope": ["constant.language.boolean.yaml", "constant.language.null.yaml"],
+      "settings": {
+        "foreground": "{{dank16.color12.default.hex}}"
+      }
+    },
+    {
+      "scope": ["punctuation.separator.key-value.mapping.yaml"],
+      "settings": {
+        "foreground": "{{colors.on_surface.default.hex}}"
+      }
+    },
+    {
+      "scope": ["entity.name.tag.toml", "support.type.property-name.toml"],
+      "settings": {
+        "foreground": "{{colors.on_surface.default.hex}}"
+      }
+    },
+    {
+      "scope": ["string.quoted.single.basic.line.toml", "string.quoted.double.basic.line.toml"],
+      "settings": {
+        "foreground": "{{dank16.color2.default.hex}}"
+      }
+    },
+    {
+      "scope": ["constant.language.boolean.toml", "constant.numeric.toml"],
+      "settings": {
+        "foreground": "{{dank16.color12.default.hex}}"
+      }
+    },
+    {
+      "scope": ["meta.object-literal.key", "support.type.property-name.json"],
+      "settings": {
+        "foreground": "{{colors.on_surface.default.hex}}"
+      }
     }
   ],
   "semanticTokenColors": {

quickshell/matugen/templates/vscode-color-theme-light.json

@@ -78,6 +78,7 @@
     "list.focusBackground": "{{colors.surface_container_high.light.hex}}",
     "list.focusForeground": "{{colors.on_surface.light.hex}}",
     "list.highlightForeground": "{{colors.primary.light.hex}}",
+    "list.focusHighlightForeground": "{{colors.on_primary.light.hex}}",
     "list.errorForeground": "{{colors.error.light.hex}}",
     "list.warningForeground": "{{colors.tertiary.light.hex}}",
     "statusBar.background": "{{colors.surface_container.light.hex}}",
@@ -154,9 +155,9 @@
     "breadcrumb.foreground": "{{colors.outline.light.hex}}",
     "breadcrumb.focusForeground": "{{colors.on_surface.light.hex}}",
     "breadcrumb.activeSelectionForeground": "{{colors.primary.light.hex}}",
-    "scrollbarSlider.background": "{{colors.outline.light.hex}}40",
+    "scrollbarSlider.background": "{{colors.on_surface_variant.light.hex}}50",
-    "scrollbarSlider.hoverBackground": "{{colors.outline.light.hex}}60",
+    "scrollbarSlider.hoverBackground": "{{colors.on_surface_variant.light.hex}}80",
-    "scrollbarSlider.activeBackground": "{{colors.outline.light.hex}}80",
+    "scrollbarSlider.activeBackground": "{{colors.on_surface_variant.light.hex}}AA",
     "menubar.selectionBackground": "{{colors.primary_container.light.hex}}",
     "menubar.selectionForeground": "{{colors.on_primary_container.light.hex}}",
     "menu.background": "{{colors.surface_container.light.hex}}",
@@ -239,10 +240,46 @@
         "meta.object-literal.key",
         "meta.property.object",
         "variable.other.property",
-        "entity.name.tag.yaml"
+        "support.type.property-name.json"
       ],
       "settings": {
-        "foreground": "{{dank16.color4.light.hex}}"
+        "foreground": "{{colors.on_surface.light.hex}}"
+      }
+    },
+    {
+      "scope": ["entity.name.tag.yaml", "punctuation.definition.block.sequence.item.yaml", "punctuation.separator.key-value.mapping.yaml"],
+      "settings": {
+        "foreground": "{{colors.on_surface.light.hex}}"
+      }
+    },
+    {
+      "scope": ["source.yaml string.unquoted", "source.yaml string.quoted"],
+      "settings": {
+        "foreground": "{{dank16.color3.light.hex}}"
+      }
+    },
+    {
+      "scope": ["constant.language.boolean.yaml", "constant.language.null.yaml"],
+      "settings": {
+        "foreground": "{{dank16.color0.light.hex}}"
+      }
+    },
+    {
+      "scope": ["entity.name.tag.toml", "support.type.property-name.toml"],
+      "settings": {
+        "foreground": "{{colors.on_surface.light.hex}}"
+      }
+    },
+    {
+      "scope": ["string.quoted.single.basic.line.toml", "string.quoted.double.basic.line.toml"],
+      "settings": {
+        "foreground": "{{dank16.color2.light.hex}}"
+      }
+    },
+    {
+      "scope": ["constant.language.boolean.toml", "constant.numeric.toml"],
+      "settings": {
+        "foreground": "{{dank16.color0.light.hex}}"
       }
     },
     {