From 1a8766a291f48ad04b409486d349d1eca7a9042c Mon Sep 17 00:00:00 2001 From: bbedward Date: Thu, 21 Aug 2025 09:17:54 -0400 Subject: [PATCH] Revert "aggressive colors" This reverts commit 32e9f481bce61a205e0489f1524cc87484a371ff. --- generate-themes.sh | 2 +- templates/dgop.json | 54 +++++++++++++++++------------------ templates/ghostty-colors.conf | 12 ++++---- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/generate-themes.sh b/generate-themes.sh index ccea0667..b62707a1 100755 --- a/generate-themes.sh +++ b/generate-themes.sh @@ -201,7 +201,7 @@ elif [ "$MODE" = "generate-color" ]; then echo "Generating system themes from color: $INPUT_SOURCE" echo "Using config: $SHELL_DIR/matugen-config.toml" - if ! matugen -v -c matugen-config.toml color hex "$INPUT_SOURCE" --type scheme-fidelity; then + if ! matugen -v -c matugen-config.toml color hex "$INPUT_SOURCE"; then echo "Failed to generate system themes with matugen" >&2 exit 1 fi diff --git a/templates/dgop.json b/templates/dgop.json index 28cecff9..e28899c0 100644 --- a/templates/dgop.json +++ b/templates/dgop.json @@ -1,49 +1,49 @@ { "ui": { - "border_primary": "{{colors.primary_container.default.hex}}", + "border_primary": "{{colors.primary.default.hex}}", "border_secondary": "{{colors.secondary.default.hex}}", - "header_background": "{{colors.primary_container.default.hex}}", - "header_text": "{{colors.on_primary_container.default.hex}}", + "header_background": "{{colors.primary.default.hex}}", + "header_text": "{{colors.on_primary.default.hex}}", "footer_background": "{{colors.surface_container.default.hex}}", "footer_text": "{{colors.on_surface_variant.default.hex}}", "text_primary": "{{colors.on_surface.default.hex}}", "text_secondary": "{{colors.on_surface_variant.default.hex}}", - "text_accent": "{{colors.primary_container.default.hex}}", - "selection_background": "{{colors.primary_container.default.hex}}", - "selection_text": "{{colors.on_primary_container.default.hex}}" + "text_accent": "{{colors.primary.default.hex}}", + "selection_background": "{{colors.primary.default.hex}}", + "selection_text": "{{colors.on_primary.default.hex}}" }, "charts": { - "network_download": "{{colors.primary_container.default.hex}}", - "network_upload": "{{colors.primary.default.hex}}", - "network_line": "{{colors.primary_container.default.hex}}", - "cpu_core_low": "{{colors.primary.default.hex}}", - "cpu_core_medium": "{{colors.primary_container.default.hex}}", - "cpu_core_high": "{{colors.primary_container.default.hex}}", - "disk_read": "{{colors.primary_container.default.hex}}", - "disk_write": "{{colors.primary.default.hex}}" + "network_download": "{{colors.primary.default.hex}}", + "network_upload": "{{colors.primary_container.default.hex}}", + "network_line": "{{colors.secondary.default.hex}}", + "cpu_core_low": "{{colors.primary_container.default.hex}}", + "cpu_core_medium": "{{colors.primary.default.hex}}", + "cpu_core_high": "{{colors.tertiary.default.hex}}", + "disk_read": "{{colors.primary.default.hex}}", + "disk_write": "{{colors.primary_container.default.hex}}" }, "progress_bars": { - "memory_low": "{{colors.primary.default.hex}}", - "memory_medium": "{{colors.primary_container.default.hex}}", - "memory_high": "{{colors.primary_container.default.hex}}", - "disk_low": "{{colors.primary.default.hex}}", - "disk_medium": "{{colors.primary_container.default.hex}}", - "disk_high": "{{colors.primary_container.default.hex}}", - "cpu_low": "{{colors.primary.default.hex}}", - "cpu_medium": "{{colors.primary_container.default.hex}}", - "cpu_high": "{{colors.primary_container.default.hex}}", + "memory_low": "{{colors.primary_container.default.hex}}", + "memory_medium": "{{colors.primary.default.hex}}", + "memory_high": "{{colors.tertiary.default.hex}}", + "disk_low": "{{colors.primary_container.default.hex}}", + "disk_medium": "{{colors.primary.default.hex}}", + "disk_high": "{{colors.tertiary.default.hex}}", + "cpu_low": "{{colors.primary_container.default.hex}}", + "cpu_medium": "{{colors.primary.default.hex}}", + "cpu_high": "{{colors.tertiary.default.hex}}", "progress_background": "{{colors.surface_container_high.default.hex}}" }, "temperature": { - "cold": "{{colors.primary.default.hex}}", - "warm": "{{colors.primary_container.default.hex}}", - "hot": "{{colors.primary_container.default.hex}}", + "cold": "{{colors.primary_container.default.hex}}", + "warm": "{{colors.primary.default.hex}}", + "hot": "{{colors.tertiary.default.hex}}", "danger": "{{colors.error.default.hex}}" }, "status": { "success": "#22C55E", "warning": "#F59E0B", "error": "{{colors.error.default.hex}}", - "info": "{{colors.primary_container.default.hex}}" + "info": "{{colors.primary.default.hex}}" } } \ No newline at end of file diff --git a/templates/ghostty-colors.conf b/templates/ghostty-colors.conf index 6090241c..5fc37708 100644 --- a/templates/ghostty-colors.conf +++ b/templates/ghostty-colors.conf @@ -1,20 +1,20 @@ background = {{colors.background.default.hex}} foreground = {{colors.on_background.default.hex}} cursor-color = {{colors.inverse_primary.default.hex}} -selection-background = {{colors.primary.default.hex}} +selection-background = {{colors.secondary.default.hex}} selection-foreground = #ffffff palette = 0={{colors.background.default.hex}} palette = 1={{colors.error.default.hex}} -palette = 2={{colors.primary.default.hex}} -palette = 3={{colors.primary.default.hex}} +palette = 2={{colors.tertiary.default.hex}} +palette = 3={{colors.secondary.default.hex}} palette = 4={{colors.primary.default.hex}} -palette = 5={{colors.primary_container.default.hex}} +palette = 5={{colors.tertiary_container.default.hex}} palette = 6={{colors.inverse_primary.default.hex}} palette = 7={{colors.on_background.default.hex}} palette = 8={{colors.on_surface_variant.default.hex}} palette = 9={{colors.error.default.hex}} -palette = 10={{colors.primary.default.hex}} -palette = 11={{colors.primary.default.hex}} +palette = 10={{colors.tertiary.default.hex}} +palette = 11={{colors.secondary.default.hex}} palette = 12={{colors.primary.default.hex}} palette = 13={{colors.outline.default.hex}} palette = 14={{colors.inverse_primary.default.hex}}