more tera cleanup & update terminal (#46)

catppuccin · Nov 12, 2024 · 85b1ced · 85b1ced
1 parent 2f1c58a
commit 85b1ced
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/themes/catppuccin-mauve.json b/themes/catppuccin-mauve.json
@@ -77,7 +77,7 @@
                 "terminal.ansi.blue": "#1e66f5",
                 "terminal.ansi.magenta": "#ea76cb",
                 "terminal.ansi.cyan": "#179299",
-                "terminal.ansi.white": "#4c4f69",
+                "terminal.ansi.white": "#5c5f77",
                 "terminal.ansi.bright_black": "#acb0be",
                 "terminal.ansi.bright_red": "#d20f39",
                 "terminal.ansi.bright_green": "#40a02b",
@@ -477,7 +477,7 @@
                 "terminal.ansi.blue": "#8caaee",
                 "terminal.ansi.magenta": "#f4b8e4",
                 "terminal.ansi.cyan": "#81c8be",
-                "terminal.ansi.white": "#c6d0f5",
+                "terminal.ansi.white": "#b5bfe2",
                 "terminal.ansi.bright_black": "#626880",
                 "terminal.ansi.bright_red": "#e78284",
                 "terminal.ansi.bright_green": "#a6d189",
@@ -877,7 +877,7 @@
                 "terminal.ansi.blue": "#8aadf4",
                 "terminal.ansi.magenta": "#f5bde6",
                 "terminal.ansi.cyan": "#8bd5ca",
-                "terminal.ansi.white": "#cad3f5",
+                "terminal.ansi.white": "#b8c0e0",
                 "terminal.ansi.bright_black": "#5b6078",
                 "terminal.ansi.bright_red": "#ed8796",
                 "terminal.ansi.bright_green": "#a6da95",
@@ -1277,7 +1277,7 @@
                 "terminal.ansi.blue": "#89b4fa",
                 "terminal.ansi.magenta": "#f5c2e7",
                 "terminal.ansi.cyan": "#94e2d5",
-                "terminal.ansi.white": "#cdd6f4",
+                "terminal.ansi.white": "#bac2de",
                 "terminal.ansi.bright_black": "#585b70",
                 "terminal.ansi.bright_red": "#f38ba8",
                 "terminal.ansi.bright_green": "#a6e3a1",

diff --git a/themes/catppuccin-no-italics-mauve.json b/themes/catppuccin-no-italics-mauve.json
@@ -77,7 +77,7 @@
                 "terminal.ansi.blue": "#1e66f5",
                 "terminal.ansi.magenta": "#ea76cb",
                 "terminal.ansi.cyan": "#179299",
-                "terminal.ansi.white": "#4c4f69",
+                "terminal.ansi.white": "#5c5f77",
                 "terminal.ansi.bright_black": "#acb0be",
                 "terminal.ansi.bright_red": "#d20f39",
                 "terminal.ansi.bright_green": "#40a02b",
@@ -477,7 +477,7 @@
                 "terminal.ansi.blue": "#8caaee",
                 "terminal.ansi.magenta": "#f4b8e4",
                 "terminal.ansi.cyan": "#81c8be",
-                "terminal.ansi.white": "#c6d0f5",
+                "terminal.ansi.white": "#b5bfe2",
                 "terminal.ansi.bright_black": "#626880",
                 "terminal.ansi.bright_red": "#e78284",
                 "terminal.ansi.bright_green": "#a6d189",
@@ -877,7 +877,7 @@
                 "terminal.ansi.blue": "#8aadf4",
                 "terminal.ansi.magenta": "#f5bde6",
                 "terminal.ansi.cyan": "#8bd5ca",
-                "terminal.ansi.white": "#cad3f5",
+                "terminal.ansi.white": "#b8c0e0",
                 "terminal.ansi.bright_black": "#5b6078",
                 "terminal.ansi.bright_red": "#ed8796",
                 "terminal.ansi.bright_green": "#a6da95",
@@ -1277,7 +1277,7 @@
                 "terminal.ansi.blue": "#89b4fa",
                 "terminal.ansi.magenta": "#f5c2e7",
                 "terminal.ansi.cyan": "#94e2d5",
-                "terminal.ansi.white": "#cdd6f4",
+                "terminal.ansi.white": "#bac2de",
                 "terminal.ansi.bright_black": "#585b70",
                 "terminal.ansi.bright_red": "#f38ba8",
                 "terminal.ansi.bright_green": "#a6e3a1",

diff --git a/zed.tera b/zed.tera
@@ -14,7 +14,6 @@ whiskers:
     "themes": [
         {%- for _, flavor in flavors -%}
         {%- set c = flavor.colors -%}
-        {%- set accentName = c[accent].identifier -%}
         {% set players = [
             c.text  | mix(color=c.sapphire, amount=0.6),
             c.text  | mix(color=c.red, amount=0.6),
@@ -27,7 +26,7 @@ whiskers:
         {%- set italics = if(cond=variant == "-no-italics", t="null", f='"italic"') -%}
         {% set predictColor = c.surface2 | mix(color=c.blue, amount=0.33) %}
         {
-            "name": "Catppuccin {{ flavor.name }} {%- if accentName != 'mauve' %} ({{ accentName }}) {%- endif -%} {%- if variant == "-no-italics" %} - No Italics {%- endif -%}",
+            "name": "Catppuccin {{ flavor.name }} {%- if accent != 'mauve' %} ({{ accent }}) {%- endif -%} {%- if variant == "-no-italics" %} - No Italics {%- endif -%}",
             "appearance": {% if flavor.dark %}"dark"{% else %}"light"{% endif %},
             "style": {
                 "border": "#{{ c.surface0.hex }}",
@@ -103,7 +102,7 @@ whiskers:
                 "terminal.ansi.blue": "#{{ c.blue.hex }}",
                 "terminal.ansi.magenta": "#{{ c.pink.hex }}",
                 "terminal.ansi.cyan": "#{{ c.teal.hex }}",
-                "terminal.ansi.white": "#{{ c.text.hex }}",
+                "terminal.ansi.white": "#{{ c.subtext1.hex }}",
                 {#- colors.bright #}
                 "terminal.ansi.bright_black": "#{{ c.surface2.hex }}",
                 "terminal.ansi.bright_red": "#{{ c.red.hex }}",