From 001ba5bf128e8e1a5cd9aae5ee8070c3a907cce8 Mon Sep 17 00:00:00 2001
From: nullishamy <git@amyerskine.me>
Date: Fri, 24 May 2024 16:10:06 +0100
Subject: [PATCH] feat: reintroduce black tweak as OLED-esque variant (#213)

---
 build.py                                     |  4 +-
 patches/colloid/palette.tera                 | 64 +++++++++++++-------
 patches/colloid/sass-palette-frappe.patch    | 42 ++++++-------
 patches/colloid/sass-palette-latte.patch     | 42 ++++++-------
 patches/colloid/sass-palette-macchiato.patch | 42 ++++++-------
 patches/colloid/sass-palette-mocha.patch     | 42 ++++++-------
 6 files changed, 129 insertions(+), 107 deletions(-)

diff --git a/build.py b/build.py
index fe0a321c..515be5ea 100755
--- a/build.py
+++ b/build.py
@@ -190,11 +190,11 @@ def build(ctx: BuildContext):
 
     if not ctx.flavor.dark:
         shutil.copytree(
-            f"{SRC_DIR}/main/plank/theme-Light-Catppuccin/", f"{output_dir}/plank"
+            f"{SRC_DIR}/main/plank/theme-Light-Catppuccin/", f"{output_dir}/plank", dirs_exist_ok=True
         )
     else:
         shutil.copytree(
-            f"{SRC_DIR}/main/plank/theme-Dark-Catppuccin/", f"{output_dir}/plank"
+            f"{SRC_DIR}/main/plank/theme-Dark-Catppuccin/", f"{output_dir}/plank", dirs_exist_ok=True
         )
 
 
diff --git a/patches/colloid/palette.tera b/patches/colloid/palette.tera
index a2e0ee9e..d38e2335 100644
--- a/patches/colloid/palette.tera
+++ b/patches/colloid/palette.tera
@@ -47,31 +47,53 @@ index 00000000..8a905942
 +$orange-dark: #{{ palette.peach.hex }};
 +
 +// Grey
-+$grey-050: #{{ palette.text.hex }};
-+$grey-100: #{{ palette.subtext1.hex }};
-+$grey-150: #{{ palette.subtext1.hex }};
-+$grey-200: #{{ palette.subtext0.hex }};
-+$grey-250: #{{ palette.subtext0.hex }};
-+$grey-300: #{{ palette.overlay1.hex }};
-+$grey-350: #{{ palette.overlay1.hex }};
-+$grey-400: #{{ palette.overlay0.hex }};
-+$grey-450: #{{ palette.overlay0.hex }};
-+$grey-500: #{{ palette.surface2.hex }};
-+$grey-550: #{{ palette.surface2.hex }};
-+$grey-600: #{{ palette.surface1.hex }};
-+$grey-650: #{{ palette.surface1.hex }};
-+$grey-700: #{{ palette.surface0.hex }};
-+$grey-750: #{{ palette.surface0.hex }};
-+$grey-800: #{{ palette.base.hex }};
-+$grey-850: #{{ palette.base.hex }};
-+$grey-900: #{{ palette.crust.hex }};
-+$grey-950: #{{ palette.crust.hex }};
+{% if flavor.dark -%}  {#- https://github.com/catppuccin/gtk/blob/0c3e8817da94769887c690b2211e006b287b27b1/scripts/recolor.py#L153-L176 -#}
++$grey-050: #{{ palette.overlay2.hex }};
++$grey-100: #{{ palette.overlay1.hex }};
++$grey-150: #{{ palette.overlay0.hex }};
++$grey-200: #{{ palette.surface2.hex }};
++$grey-250: #{{ palette.surface1.hex }};
++$grey-300: red;
++$grey-350: red;
++$grey-400: red;
++$grey-450: red;
++$grey-500: red;
++$grey-550: red;
++$grey-600: red;
++$grey-650: #{{ palette.surface0.hex }};
++$grey-700: #{{ palette.base.hex }};
++$grey-750: #{{ palette.crust.hex }};
++$grey-800: #{{ palette.crust.hex }};
++$grey-850: #020202;
++$grey-900: #010101;
++$grey-950: #000000;
+{%- else -%} {#- Light mode https://github.com/catppuccin/gtk/blob/0c3e8817da94769887c690b2211e006b287b27b1/scripts/recolor.py#L128-L151 -#}
++$grey-050: #{{ palette.crust.hex }};
++$grey-100: #{{ palette.mantle.hex }};
++$grey-150: #{{ palette.base.hex }};
++$grey-200: #{{ palette.surface0.hex }};
++$grey-250: #{{ palette.surface1.hex }};
++$grey-300: red;
++$grey-350: red;
++$grey-400: red;
++$grey-450: red;
++$grey-500: red;
++$grey-550: red;
++$grey-600: red;
++$grey-650: #{{ palette.base.hex }};
++$grey-700: #{{ palette.base.hex }};
++$grey-750: #{{ palette.mantle.hex }};
++$grey-800: #{{ palette.text.hex }};
++$grey-850: #020202;
++$grey-900: #010101;
++$grey-950: #000000;
+{%- endif %}
 +
 +// White
-+$white: #FFFFFF;
++$white: #eff1f5;
 +
 +// Black
-+$black: #000000;
++$black: #11111b;
 +
 +// Button
 +$button-close: #{{ palette.red.hex }};
diff --git a/patches/colloid/sass-palette-frappe.patch b/patches/colloid/sass-palette-frappe.patch
index 824f0cc8..908ac4b3 100644
--- a/patches/colloid/sass-palette-frappe.patch
+++ b/patches/colloid/sass-palette-frappe.patch
@@ -39,31 +39,31 @@ index 00000000..8a905942
 +$orange-dark: #ef9f76;
 +
 +// Grey
-+$grey-050: #c6d0f5;
-+$grey-100: #b5bfe2;
-+$grey-150: #b5bfe2;
-+$grey-200: #a5adce;
-+$grey-250: #a5adce;
-+$grey-300: #838ba7;
-+$grey-350: #838ba7;
-+$grey-400: #737994;
-+$grey-450: #737994;
-+$grey-500: #626880;
-+$grey-550: #626880;
-+$grey-600: #51576d;
-+$grey-650: #51576d;
-+$grey-700: #414559;
-+$grey-750: #414559;
-+$grey-800: #303446;
-+$grey-850: #303446;
-+$grey-900: #232634;
-+$grey-950: #232634;
++$grey-050: #949cbb;
++$grey-100: #838ba7;
++$grey-150: #737994;
++$grey-200: #626880;
++$grey-250: #51576d;
++$grey-300: red;
++$grey-350: red;
++$grey-400: red;
++$grey-450: red;
++$grey-500: red;
++$grey-550: red;
++$grey-600: red;
++$grey-650: #414559;
++$grey-700: #303446;
++$grey-750: #232634;
++$grey-800: #232634;
++$grey-850: #020202;
++$grey-900: #010101;
++$grey-950: #000000;
 +
 +// White
-+$white: #FFFFFF;
++$white: #eff1f5;
 +
 +// Black
-+$black: #000000;
++$black: #11111b;
 +
 +// Button
 +$button-close: #e78284;
diff --git a/patches/colloid/sass-palette-latte.patch b/patches/colloid/sass-palette-latte.patch
index f8138a52..4284b11d 100644
--- a/patches/colloid/sass-palette-latte.patch
+++ b/patches/colloid/sass-palette-latte.patch
@@ -39,31 +39,31 @@ index 00000000..8a905942
 +$orange-dark: #fe640b;
 +
 +// Grey
-+$grey-050: #4c4f69;
-+$grey-100: #5c5f77;
-+$grey-150: #5c5f77;
-+$grey-200: #6c6f85;
-+$grey-250: #6c6f85;
-+$grey-300: #8c8fa1;
-+$grey-350: #8c8fa1;
-+$grey-400: #9ca0b0;
-+$grey-450: #9ca0b0;
-+$grey-500: #acb0be;
-+$grey-550: #acb0be;
-+$grey-600: #bcc0cc;
-+$grey-650: #bcc0cc;
-+$grey-700: #ccd0da;
-+$grey-750: #ccd0da;
-+$grey-800: #eff1f5;
-+$grey-850: #eff1f5;
-+$grey-900: #dce0e8;
-+$grey-950: #dce0e8;
++$grey-050: #dce0e8;
++$grey-100: #e6e9ef;
++$grey-150: #eff1f5;
++$grey-200: #ccd0da;
++$grey-250: #bcc0cc;
++$grey-300: red;
++$grey-350: red;
++$grey-400: red;
++$grey-450: red;
++$grey-500: red;
++$grey-550: red;
++$grey-600: red;
++$grey-650: #eff1f5;
++$grey-700: #eff1f5;
++$grey-750: #e6e9ef;
++$grey-800: #4c4f69;
++$grey-850: #020202;
++$grey-900: #010101;
++$grey-950: #000000;
 +
 +// White
-+$white: #FFFFFF;
++$white: #eff1f5;
 +
 +// Black
-+$black: #000000;
++$black: #11111b;
 +
 +// Button
 +$button-close: #d20f39;
diff --git a/patches/colloid/sass-palette-macchiato.patch b/patches/colloid/sass-palette-macchiato.patch
index 23bbd2d7..953e4704 100644
--- a/patches/colloid/sass-palette-macchiato.patch
+++ b/patches/colloid/sass-palette-macchiato.patch
@@ -39,31 +39,31 @@ index 00000000..8a905942
 +$orange-dark: #f5a97f;
 +
 +// Grey
-+$grey-050: #cad3f5;
-+$grey-100: #b8c0e0;
-+$grey-150: #b8c0e0;
-+$grey-200: #a5adcb;
-+$grey-250: #a5adcb;
-+$grey-300: #8087a2;
-+$grey-350: #8087a2;
-+$grey-400: #6e738d;
-+$grey-450: #6e738d;
-+$grey-500: #5b6078;
-+$grey-550: #5b6078;
-+$grey-600: #494d64;
-+$grey-650: #494d64;
-+$grey-700: #363a4f;
-+$grey-750: #363a4f;
-+$grey-800: #24273a;
-+$grey-850: #24273a;
-+$grey-900: #181926;
-+$grey-950: #181926;
++$grey-050: #939ab7;
++$grey-100: #8087a2;
++$grey-150: #6e738d;
++$grey-200: #5b6078;
++$grey-250: #494d64;
++$grey-300: red;
++$grey-350: red;
++$grey-400: red;
++$grey-450: red;
++$grey-500: red;
++$grey-550: red;
++$grey-600: red;
++$grey-650: #363a4f;
++$grey-700: #24273a;
++$grey-750: #181926;
++$grey-800: #181926;
++$grey-850: #020202;
++$grey-900: #010101;
++$grey-950: #000000;
 +
 +// White
-+$white: #FFFFFF;
++$white: #eff1f5;
 +
 +// Black
-+$black: #000000;
++$black: #11111b;
 +
 +// Button
 +$button-close: #ed8796;
diff --git a/patches/colloid/sass-palette-mocha.patch b/patches/colloid/sass-palette-mocha.patch
index c7f1ecb7..ebb9d854 100644
--- a/patches/colloid/sass-palette-mocha.patch
+++ b/patches/colloid/sass-palette-mocha.patch
@@ -39,31 +39,31 @@ index 00000000..8a905942
 +$orange-dark: #fab387;
 +
 +// Grey
-+$grey-050: #cdd6f4;
-+$grey-100: #bac2de;
-+$grey-150: #bac2de;
-+$grey-200: #a6adc8;
-+$grey-250: #a6adc8;
-+$grey-300: #7f849c;
-+$grey-350: #7f849c;
-+$grey-400: #6c7086;
-+$grey-450: #6c7086;
-+$grey-500: #585b70;
-+$grey-550: #585b70;
-+$grey-600: #45475a;
-+$grey-650: #45475a;
-+$grey-700: #313244;
-+$grey-750: #313244;
-+$grey-800: #1e1e2e;
-+$grey-850: #1e1e2e;
-+$grey-900: #11111b;
-+$grey-950: #11111b;
++$grey-050: #9399b2;
++$grey-100: #7f849c;
++$grey-150: #6c7086;
++$grey-200: #585b70;
++$grey-250: #45475a;
++$grey-300: red;
++$grey-350: red;
++$grey-400: red;
++$grey-450: red;
++$grey-500: red;
++$grey-550: red;
++$grey-600: red;
++$grey-650: #313244;
++$grey-700: #1e1e2e;
++$grey-750: #11111b;
++$grey-800: #11111b;
++$grey-850: #020202;
++$grey-900: #010101;
++$grey-950: #000000;
 +
 +// White
-+$white: #FFFFFF;
++$white: #eff1f5;
 +
 +// Black
-+$black: #000000;
++$black: #11111b;
 +
 +// Button
 +$button-close: #f38ba8;