Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-24 13:32:50 -05:00
Code Packages Releases Activity

feat/matugen3 (#771)

Browse Source 
* added matugen 3 terminal templates and logic

fixed version check and light terminal check

refactored json generation

fixed syntax

keep tmp debug

fixed file outputs

fixed syntax issues and implicit passing

added debug stderr output

* moved calls to matugen after template is built correctly

added --json hex

disabled debug message

cleaned up code into modular functions, re-added second full matugen call

fixed args

added shift

commented vs code section

debug changes

* arg format fixes

fixed json import flag

fixed string quotation

fix arg order

* cleaned up

fix cfg naming

* removed mt2.0 templates and refactored worker

removed/replaced matugen 2 templates

fix formatter diffs + consistent styling

* fixed last json output

* fixed syntax error

* vs code templates

* matugen: inject all stock/custom theme colors as overrides
- also some general architectural changes

* dank16: remove vscode enrich option

---------

Co-authored-by: bbedward
This commit is contained in:
Saurabh
2025-11-27 08:34:53 +11:00
committed by GitHub
parent 85704e3947
commit de8f2e6a68
19 changed files with 1187 additions and 929 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
quickshell/matugen/templates/alacritty.toml
View File

@@ -9,3 +9,23 @@ background = '{{colors.primary_container.default.hex}}'
[colors.cursor]
text = '{{colors.background.default.hex}}'
cursor = '{{colors.primary.default.hex}}'
[colors.normal]
black = '{{dank16.color0}}'
red = '{{dank16.color1}}'
green = '{{dank16.color2}}'
yellow = '{{dank16.color3}}'
blue = '{{dank16.color4}}'
magenta = '{{dank16.color5}}'
cyan = '{{dank16.color6}}'
white = '{{dank16.color7}}'
[colors.bright]
black = '{{dank16.color8}}'
red = '{{dank16.color9}}'
green = '{{dank16.color10}}'
yellow = '{{dank16.color11}}'
blue = '{{dank16.color12}}'
magenta = '{{dank16.color13}}'
cyan = '{{dank16.color14}}'
white = '{{dank16.color15}}'

17
quickshell/matugen/templates/foot.ini
View File

@@ -3,3 +3,20 @@ foreground={{colors.on_surface.default.hex_stripped}}
background={{colors.background.default.hex_stripped}}
selection-foreground={{colors.on_surface.default.hex_stripped}}
selection-background={{colors.primary_container.default.hex_stripped}}
regular0={{dank16.color0 | remove_prefix: '#'}}
regular1={{dank16.color1 | remove_prefix: '#'}}
regular2={{dank16.color2 | remove_prefix: '#'}}
regular3={{dank16.color3 | remove_prefix: '#'}}
regular4={{dank16.color4 | remove_prefix: '#'}}
regular5={{dank16.color5 | remove_prefix: '#'}}
regular6={{dank16.color6 | remove_prefix: '#'}}
regular7={{dank16.color7 | remove_prefix: '#'}}
bright0={{dank16.color8 | remove_prefix: '#'}}
bright1={{dank16.color9 | remove_prefix: '#'}}
bright2={{dank16.color10 | remove_prefix: '#'}}
bright3={{dank16.color11 | remove_prefix: '#'}}
bright4={{dank16.color12 | remove_prefix: '#'}}
bright5={{dank16.color13 | remove_prefix: '#'}}
bright6={{dank16.color14 | remove_prefix: '#'}}
bright7={{dank16.color15 | remove_prefix: '#'}}

19
quickshell/matugen/templates/ghostty.conf
View File

@@ -2,4 +2,21 @@ background = {{colors.background.default.hex}}
foreground = {{colors.on_surface.default.hex}}
cursor-color = {{colors.primary.default.hex}}
selection-background = {{colors.primary_container.default.hex}}
selection-foreground = {{colors.on_surface.default.hex}}
selection-foreground = {{colors.on_surface.default.hex}}
palette = 0={{dank16.color0}}
palette = 1={{dank16.color1}}
palette = 2={{dank16.color2}}
palette = 3={{dank16.color3}}
palette = 4={{dank16.color4}}
palette = 5={{dank16.color5}}
palette = 6={{dank16.color6}}
palette = 7={{dank16.color7}}
palette = 8={{dank16.color8}}
palette = 9={{dank16.color9}}
palette = 10={{dank16.color10}}
palette = 11={{dank16.color11}}
palette = 12={{dank16.color12}}
palette = 13={{dank16.color13}}
palette = 14={{dank16.color14}}
palette = 15={{dank16.color15}}

19
quickshell/matugen/templates/kitty.conf
View File

@@ -5,4 +5,21 @@ foreground {{colors.on_surface.default.hex}}
background {{colors.background.default.hex}}
selection_foreground {{colors.on_secondary.default.hex}}
selection_background {{colors.secondary_fixed_dim.default.hex}}
url_color {{colors.primary.default.hex}}
url_color {{colors.primary.default.hex}}
color0 {{dank16.color0}}
color1 {{dank16.color1}}
color2 {{dank16.color2}}
color3 {{dank16.color3}}
color4 {{dank16.color4}}
color5 {{dank16.color5}}
color6 {{dank16.color6}}
color7 {{dank16.color7}}
color8 {{dank16.color8}}
color9 {{dank16.color9}}
color10 {{dank16.color10}}
color11 {{dank16.color11}}
color12 {{dank16.color12}}
color13 {{dank16.color13}}
color14 {{dank16.color14}}
color15 {{dank16.color15}}

172
quickshell/matugen/templates/vscode-color-theme-dark.json
View File

@@ -97,6 +97,22 @@
"terminal.background": "{{colors.background.dark.hex}}",
"terminal.foreground": "{{colors.on_surface.dark.hex}}",
"terminal.ansiBlack": "{{dank16.color0}}",
"terminal.ansiRed": "{{dank16.color1}}",
"terminal.ansiGreen": "{{dank16.color2}}",
"terminal.ansiYellow": "{{dank16.color3}}",
"terminal.ansiBlue": "{{dank16.color4}}",
"terminal.ansiMagenta": "{{dank16.color5}}",
"terminal.ansiCyan": "{{dank16.color6}}",
"terminal.ansiWhite": "{{dank16.color7}}",
"terminal.ansiBrightBlack": "{{dank16.color8}}",
"terminal.ansiBrightRed": "{{dank16.color9}}",
"terminal.ansiBrightGreen": "{{dank16.color10}}",
"terminal.ansiBrightYellow": "{{dank16.color11}}",
"terminal.ansiBrightBlue": "{{dank16.color12}}",
"terminal.ansiBrightMagenta": "{{dank16.color13}}",
"terminal.ansiBrightCyan": "{{dank16.color14}}",
"terminal.ansiBrightWhite": "{{dank16.color15}}",
"gitDecoration.modifiedResourceForeground": "{{colors.primary.dark.hex}}",
"gitDecoration.addedResourceForeground": "{{colors.primary.dark.hex}}",
@@ -158,19 +174,6 @@
},
"tokenColors": [
{
"scope": ["comment", "punctuation.definition.comment"],
"settings": {
"foreground": "{{colors.outline.dark.hex}}",
"fontStyle": "italic"
}
},
{
"scope": ["keyword", "storage.type", "storage.modifier"],
"settings": {
"foreground": "{{colors.primary.dark.hex}}"
}
},
{
"scope": ["variable", "meta.object-literal.key"],
"settings": {
@@ -263,53 +266,166 @@
"settings": {
"foreground": "{{colors.secondary.dark.hex}}"
}
},
{
"scope": ["comment", "punctuation.definition.comment"],
"settings": {
"foreground": "{{dank16.color8}}"
}
},
{
"scope": "keyword",
"settings": {
"foreground": "{{dank16.color5}}"
}
},
{
"scope": "storage.type",
"settings": {
"foreground": "{{dank16.color13}}"
}
},
{
"scope": "storage.modifier",
"settings": {
"foreground": "{{dank16.color5}}"
}
},
{
"scope": "variable",
"settings": {
"foreground": "{{dank16.color15}}"
}
},
{
"scope": "variable.parameter",
"settings": {
"foreground": "{{dank16.color7}}"
}
},
{
"scope": ["meta.object-literal.key", "meta.property.object", "variable.other.property"],
"settings": {
"foreground": "{{dank16.color4}}"
}
},
{
"scope": "constant.other.symbol",
"settings": {
"foreground": "{{dank16.color12}}"
}
},
{
"scope": ["constant.numeric", "constant.language"],
"settings": {
"foreground": "{{dank16.color12}}"
}
},
{
"scope": "constant.character",
"settings": {
"foreground": "{{dank16.color3}}"
}
},
{
"scope": ["entity.name.type", "entity.name.class"],
"settings": {
"foreground": "{{dank16.color12}}"
}
},
{
"scope": "support.type",
"settings": {
"foreground": "{{dank16.color13}}"
}
},
{
"scope": ["entity.name.function", "support.function"],
"settings": {
"foreground": "{{dank16.color2}}"
}
},
{
"scope": ["support.class", "support.variable"],
"settings": {
"foreground": "{{dank16.color15}}"
}
},
{
"scope": "variable.language",
"settings": {
"foreground": "{{dank16.color12}}"
}
},
{
"scope": "entity.name.tag.yaml",
"settings": {
"foreground": "{{dank16.color12}}"
}
},
{
"scope": ["string.unquoted.plain.out.yaml", "string.unquoted.yaml"],
"settings": {
"foreground": "{{dank16.color15}}"
}
},
{
"scope": "string",
"settings": {
"foreground": "{{dank16.color3}}"
}
}
],
"semanticHighlighting": true,
"semanticTokenColors": {
"variable": {
"foreground": "{{dank16.color15}}"
},
"variable.readonly": {
"foreground": "{{colors.tertiary.dark.hex}}"
"foreground": "{{dank16.color12}}"
},
"property": {
"foreground": "{{colors.on_surface.dark.hex}}"
"foreground": "{{dank16.color4}}"
},
"function": {
"foreground": "{{colors.primary.dark.hex}}"
"foreground": "{{dank16.color2}}"
},
"method": {
"foreground": "{{colors.primary.dark.hex}}"
"foreground": "{{dank16.color2}}"
},
"type": {
"foreground": "{{colors.tertiary.dark.hex}}"
"foreground": "{{dank16.color12}}"
},
"class": {
"foreground": "{{colors.tertiary.dark.hex}}"
"foreground": "{{dank16.color12}}"
},
"typeParameter": {
"foreground": "{{dank16.color13}}"
},
"enumMember": {
"foreground": "{{colors.tertiary.dark.hex}}"
"foreground": "{{dank16.color12}}"
},
"string": {
"foreground": "{{colors.secondary.dark.hex}}"
"foreground": "{{dank16.color3}}"
},
"number": {
"foreground": "{{colors.tertiary.dark.hex}}"
"foreground": "{{dank16.color12}}"
},
"comment": {
"foreground": "{{colors.outline.dark.hex}}",
"fontStyle": "italic"
"foreground": "{{dank16.color8}}"
},
"keyword": {
"foreground": "{{colors.primary.dark.hex}}"
"foreground": "{{dank16.color5}}"
},
"operator": {
"foreground": "{{colors.on_surface.dark.hex}}"
"foreground": "{{dank16.color15}}"
},
"parameter": {
"foreground": "{{colors.on_surface.dark.hex}}"
"foreground": "{{dank16.color7}}"
},
"namespace": {
"foreground": "{{colors.secondary.dark.hex}}"
"foreground": "{{dank16.color15}}"
}
}
}

172
quickshell/matugen/templates/vscode-color-theme-default.json
View File

@@ -97,6 +97,22 @@
"terminal.background": "{{colors.background.default.hex}}",
"terminal.foreground": "{{colors.on_surface.default.hex}}",
"terminal.ansiBlack": "{{dank16.color0}}",
"terminal.ansiRed": "{{dank16.color1}}",
"terminal.ansiGreen": "{{dank16.color2}}",
"terminal.ansiYellow": "{{dank16.color3}}",
"terminal.ansiBlue": "{{dank16.color4}}",
"terminal.ansiMagenta": "{{dank16.color5}}",
"terminal.ansiCyan": "{{dank16.color6}}",
"terminal.ansiWhite": "{{dank16.color7}}",
"terminal.ansiBrightBlack": "{{dank16.color8}}",
"terminal.ansiBrightRed": "{{dank16.color9}}",
"terminal.ansiBrightGreen": "{{dank16.color10}}",
"terminal.ansiBrightYellow": "{{dank16.color11}}",
"terminal.ansiBrightBlue": "{{dank16.color12}}",
"terminal.ansiBrightMagenta": "{{dank16.color13}}",
"terminal.ansiBrightCyan": "{{dank16.color14}}",
"terminal.ansiBrightWhite": "{{dank16.color15}}",
"gitDecoration.modifiedResourceForeground": "{{colors.primary.default.hex}}",
"gitDecoration.addedResourceForeground": "{{colors.primary.default.hex}}",
@@ -158,19 +174,6 @@
},
"tokenColors": [
{
"scope": ["comment", "punctuation.definition.comment"],
"settings": {
"foreground": "{{colors.outline.default.hex}}",
"fontStyle": "italic"
}
},
{
"scope": ["keyword", "storage.type", "storage.modifier"],
"settings": {
"foreground": "{{colors.primary.default.hex}}"
}
},
{
"scope": ["variable", "meta.object-literal.key"],
"settings": {
@@ -263,53 +266,166 @@
"settings": {
"foreground": "{{colors.secondary.default.hex}}"
}
},
{
"scope": ["comment", "punctuation.definition.comment"],
"settings": {
"foreground": "{{dank16.color8}}"
}
},
{
"scope": "keyword",
"settings": {
"foreground": "{{dank16.color5}}"
}
},
{
"scope": "storage.type",
"settings": {
"foreground": "{{dank16.color13}}"
}
},
{
"scope": "storage.modifier",
"settings": {
"foreground": "{{dank16.color5}}"
}
},
{
"scope": "variable",
"settings": {
"foreground": "{{dank16.color15}}"
}
},
{
"scope": "variable.parameter",
"settings": {
"foreground": "{{dank16.color7}}"
}
},
{
"scope": ["meta.object-literal.key", "meta.property.object", "variable.other.property"],
"settings": {
"foreground": "{{dank16.color4}}"
}
},
{
"scope": "constant.other.symbol",
"settings": {
"foreground": "{{dank16.color12}}"
}
},
{
"scope": ["constant.numeric", "constant.language"],
"settings": {
"foreground": "{{dank16.color12}}"
}
},
{
"scope": "constant.character",
"settings": {
"foreground": "{{dank16.color3}}"
}
},
{
"scope": ["entity.name.type", "entity.name.class"],
"settings": {
"foreground": "{{dank16.color12}}"
}
},
{
"scope": "support.type",
"settings": {
"foreground": "{{dank16.color13}}"
}
},
{
"scope": ["entity.name.function", "support.function"],
"settings": {
"foreground": "{{dank16.color2}}"
}
},
{
"scope": ["support.class", "support.variable"],
"settings": {
"foreground": "{{dank16.color15}}"
}
},
{
"scope": "variable.language",
"settings": {
"foreground": "{{dank16.color12}}"
}
},
{
"scope": "entity.name.tag.yaml",
"settings": {
"foreground": "{{dank16.color12}}"
}
},
{
"scope": ["string.unquoted.plain.out.yaml", "string.unquoted.yaml"],
"settings": {
"foreground": "{{dank16.color15}}"
}
},
{
"scope": "string",
"settings": {
"foreground": "{{dank16.color3}}"
}
}
],
"semanticHighlighting": true,
"semanticTokenColors": {
"variable": {
"foreground": "{{dank16.color15}}"
},
"variable.readonly": {
"foreground": "{{colors.tertiary.default.hex}}"
"foreground": "{{dank16.color12}}"
},
"property": {
"foreground": "{{colors.on_surface.default.hex}}"
"foreground": "{{dank16.color4}}"
},
"function": {
"foreground": "{{colors.primary.default.hex}}"
"foreground": "{{dank16.color2}}"
},
"method": {
"foreground": "{{colors.primary.default.hex}}"
"foreground": "{{dank16.color2}}"
},
"type": {
"foreground": "{{colors.tertiary.default.hex}}"
"foreground": "{{dank16.color12}}"
},
"class": {
"foreground": "{{colors.tertiary.default.hex}}"
"foreground": "{{dank16.color12}}"
},
"typeParameter": {
"foreground": "{{dank16.color13}}"
},
"enumMember": {
"foreground": "{{colors.tertiary.default.hex}}"
"foreground": "{{dank16.color12}}"
},
"string": {
"foreground": "{{colors.secondary.default.hex}}"
"foreground": "{{dank16.color3}}"
},
"number": {
"foreground": "{{colors.tertiary.default.hex}}"
"foreground": "{{dank16.color12}}"
},
"comment": {
"foreground": "{{colors.outline.default.hex}}",
"fontStyle": "italic"
"foreground": "{{dank16.color8}}"
},
"keyword": {
"foreground": "{{colors.primary.default.hex}}"
"foreground": "{{dank16.color5}}"
},
"operator": {
"foreground": "{{colors.on_surface.default.hex}}"
"foreground": "{{dank16.color15}}"
},
"parameter": {
"foreground": "{{colors.on_surface.default.hex}}"
"foreground": "{{dank16.color7}}"
},
"namespace": {
"foreground": "{{colors.secondary.default.hex}}"
"foreground": "{{dank16.color15}}"
}
}
}

172
quickshell/matugen/templates/vscode-color-theme-light.json
View File

@@ -97,6 +97,22 @@
"terminal.background": "{{colors.background.light.hex}}",
"terminal.foreground": "{{colors.on_surface.light.hex}}",
"terminal.ansiBlack": "{{dank16.color0}}",
"terminal.ansiRed": "{{dank16.color1}}",
"terminal.ansiGreen": "{{dank16.color2}}",
"terminal.ansiYellow": "{{dank16.color3}}",
"terminal.ansiBlue": "{{dank16.color4}}",
"terminal.ansiMagenta": "{{dank16.color5}}",
"terminal.ansiCyan": "{{dank16.color6}}",
"terminal.ansiWhite": "{{dank16.color7}}",
"terminal.ansiBrightBlack": "{{dank16.color8}}",
"terminal.ansiBrightRed": "{{dank16.color9}}",
"terminal.ansiBrightGreen": "{{dank16.color10}}",
"terminal.ansiBrightYellow": "{{dank16.color11}}",
"terminal.ansiBrightBlue": "{{dank16.color12}}",
"terminal.ansiBrightMagenta": "{{dank16.color13}}",
"terminal.ansiBrightCyan": "{{dank16.color14}}",
"terminal.ansiBrightWhite": "{{dank16.color15}}",
"gitDecoration.modifiedResourceForeground": "{{colors.primary.light.hex}}",
"gitDecoration.addedResourceForeground": "{{colors.primary.light.hex}}",
@@ -158,19 +174,6 @@
},
"tokenColors": [
{
"scope": ["comment", "punctuation.definition.comment"],
"settings": {
"foreground": "{{colors.outline.light.hex}}",
"fontStyle": "italic"
}
},
{
"scope": ["keyword", "storage.type", "storage.modifier"],
"settings": {
"foreground": "{{colors.primary.light.hex}}"
}
},
{
"scope": ["variable", "meta.object-literal.key"],
"settings": {
@@ -263,53 +266,166 @@
"settings": {
"foreground": "{{colors.secondary.light.hex}}"
}
},
{
"scope": ["comment", "punctuation.definition.comment"],
"settings": {
"foreground": "{{dank16.color8}}"
}
},
{
"scope": "keyword",
"settings": {
"foreground": "{{dank16.color5}}"
}
},
{
"scope": "storage.type",
"settings": {
"foreground": "{{dank16.color13}}"
}
},
{
"scope": "storage.modifier",
"settings": {
"foreground": "{{dank16.color5}}"
}
},
{
"scope": "variable",
"settings": {
"foreground": "{{dank16.color15}}"
}
},
{
"scope": "variable.parameter",
"settings": {
"foreground": "{{dank16.color7}}"
}
},
{
"scope": ["meta.object-literal.key", "meta.property.object", "variable.other.property"],
"settings": {
"foreground": "{{dank16.color4}}"
}
},
{
"scope": "constant.other.symbol",
"settings": {
"foreground": "{{dank16.color12}}"
}
},
{
"scope": ["constant.numeric", "constant.language"],
"settings": {
"foreground": "{{dank16.color12}}"
}
},
{
"scope": "constant.character",
"settings": {
"foreground": "{{dank16.color3}}"
}
},
{
"scope": ["entity.name.type", "entity.name.class"],
"settings": {
"foreground": "{{dank16.color12}}"
}
},
{
"scope": "support.type",
"settings": {
"foreground": "{{dank16.color13}}"
}
},
{
"scope": ["entity.name.function", "support.function"],
"settings": {
"foreground": "{{dank16.color2}}"
}
},
{
"scope": ["support.class", "support.variable"],
"settings": {
"foreground": "{{dank16.color15}}"
}
},
{
"scope": "variable.language",
"settings": {
"foreground": "{{dank16.color12}}"
}
},
{
"scope": "entity.name.tag.yaml",
"settings": {
"foreground": "{{dank16.color12}}"
}
},
{
"scope": ["string.unquoted.plain.out.yaml", "string.unquoted.yaml"],
"settings": {
"foreground": "{{dank16.color15}}"
}
},
{
"scope": "string",
"settings": {
"foreground": "{{dank16.color3}}"
}
}
],
"semanticHighlighting": true,
"semanticTokenColors": {
"variable": {
"foreground": "{{dank16.color15}}"
},
"variable.readonly": {
"foreground": "{{colors.tertiary.light.hex}}"
"foreground": "{{dank16.color12}}"
},
"property": {
"foreground": "{{colors.on_surface.light.hex}}"
"foreground": "{{dank16.color4}}"
},
"function": {
"foreground": "{{colors.primary.light.hex}}"
"foreground": "{{dank16.color2}}"
},
"method": {
"foreground": "{{colors.primary.light.hex}}"
"foreground": "{{dank16.color2}}"
},
"type": {
"foreground": "{{colors.tertiary.light.hex}}"
"foreground": "{{dank16.color12}}"
},
"class": {
"foreground": "{{colors.tertiary.light.hex}}"
"foreground": "{{dank16.color12}}"
},
"typeParameter": {
"foreground": "{{dank16.color13}}"
},
"enumMember": {
"foreground": "{{colors.tertiary.light.hex}}"
"foreground": "{{dank16.color12}}"
},
"string": {
"foreground": "{{colors.secondary.light.hex}}"
"foreground": "{{dank16.color3}}"
},
"number": {
"foreground": "{{colors.tertiary.light.hex}}"
"foreground": "{{dank16.color12}}"
},
"comment": {
"foreground": "{{colors.outline.light.hex}}",
"fontStyle": "italic"
"foreground": "{{dank16.color8}}"
},
"keyword": {
"foreground": "{{colors.primary.light.hex}}"
"foreground": "{{dank16.color5}}"
},
"operator": {
"foreground": "{{colors.on_surface.light.hex}}"
"foreground": "{{dank16.color15}}"
},
"parameter": {
"foreground": "{{colors.on_surface.light.hex}}"
"foreground": "{{dank16.color7}}"
},
"namespace": {
"foreground": "{{colors.secondary.light.hex}}"
"foreground": "{{dank16.color15}}"
}
}
}

3
quickshell/matugen/templates/wezterm.toml
View File

@@ -8,3 +8,6 @@ cursor_border = '{{colors.primary.default.hex}}'
selection_bg = '{{colors.primary_container.default.hex}}'
selection_fg = '{{colors.on_surface.default.hex}}'
ansi = ['{{dank16.color0}}', '{{dank16.color1}}', '{{dank16.color2}}', '{{dank16.color3}}', '{{dank16.color4}}', '{{dank16.color5}}', '{{dank16.color6}}', '{{dank16.color7}}']
brights = ['{{dank16.color8}}', '{{dank16.color9}}', '{{dank16.color10}}', '{{dank16.color11}}', '{{dank16.color12}}', '{{dank16.color13}}', '{{dank16.color14}}', '{{dank16.color15}}']