From a8fc8858d9184fdefb1f69bf9705da6613d8981e Mon Sep 17 00:00:00 2001
From: LordMZTE <lord@mzte.de>
Date: Sun, 14 Jan 2024 17:59:26 +0100
Subject: [PATCH] clean up catppuccin color variables

---
 .config/mako/config.cgt          |  8 ++---
 .config/wayprompt/config.ini.cgt | 24 ++++++---------
 .config/wired/wired.ron.cgt      | 16 +++++-----
 cg_opts.lua                      | 52 ++++++++++++++++----------------
 4 files changed, 48 insertions(+), 52 deletions(-)

diff --git a/.config/mako/config.cgt b/.config/mako/config.cgt
index f311596..9761a37 100644
--- a/.config/mako/config.cgt
+++ b/.config/mako/config.cgt
@@ -9,7 +9,7 @@ default-timeout=8000
 anchor=top-left
 
 # Colors
-background-color=<% opt.catppuccin.base %>E0
-text-color=<% opt.catppuccin.text %>FF
-border-color=<% opt.catppuccin.red %>FF
-progress-color=source <% opt.catppuccin.surface0 %>E0
+background-color=#<% opt.catppuccin.base %>E0
+text-color=#<% opt.catppuccin.text %>FF
+border-color=#<% opt.catppuccin.red %>FF
+progress-color=source #<% opt.catppuccin.surface0 %>E0
diff --git a/.config/wayprompt/config.ini.cgt b/.config/wayprompt/config.ini.cgt
index fd0a97e..a903ea8 100644
--- a/.config/wayprompt/config.ini.cgt
+++ b/.config/wayprompt/config.ini.cgt
@@ -1,20 +1,16 @@
-<! function col(c)
-    return opt.catppuccin[c]:gsub("^#", "0x")
-end !>
-
 [general]
 corner-radius = 0;
 font-regular = <% opt.font %>:size=14;
 font-large = <% opt.font %>:size=20;
 
 [colours]
-background = <% col "mantle" %>;
-border = <% col "red" %>;
-text = <% col "text" %>;
-error-text = <% col "red" %>;
-pin-background = <% col "base" %>;
-pin-border = <% col "green" %>;
-pin-square = <% col "mauve" %>;
-ok-button = <% col "blue" %>;
-not-ok-button = <% col "maroon" %>;
-cancel-button = <% col "red" %>;
+background = <% opt.catppuccin.mantle %>;
+border = <% opt.catppuccin.red %>;
+text = <% opt.catppuccin.text %>;
+error-text = <% opt.catppuccin.red %>;
+pin-background = <% opt.catppuccin.base %>;
+pin-border = <% opt.catppuccin.green %>;
+pin-square = <% opt.catppuccin.mauve %>;
+ok-button = <% opt.catppuccin.blue %>;
+not-ok-button = <% opt.catppuccin.maroon %>;
+cancel-button = <% opt.catppuccin.red %>;
diff --git a/.config/wired/wired.ron.cgt b/.config/wired/wired.ron.cgt
index e3f4e9a..49d843c 100644
--- a/.config/wired/wired.ron.cgt
+++ b/.config/wired/wired.ron.cgt
@@ -14,10 +14,10 @@
         hook: Hook(parent_anchor: TL, self_anchor: TL),
         offset: Vec2(x: 25.0, y: 25.0),
         params: NotificationBlock((
-            background_color: Color(hex: "<% opt.catppuccin.mantle %>"),
-            border_color: Color(hex: "<% opt.catppuccin.red %>"),
-            border_color_critical: Color(hex: "<% opt.catppuccin.peach %>"),
-            border_color_low: Color(hex: "<% opt.catppuccin.sky %>"),
+            background_color: Color(hex: "#<% opt.catppuccin.mantle %>"),
+            border_color: Color(hex: "#<% opt.catppuccin.red %>"),
+            border_color_critical: Color(hex: "#<% opt.catppuccin.peach %>"),
+            border_color_low: Color(hex: "#<% opt.catppuccin.sky %>"),
             border_rounding: 0.0,
             border_width: 4.0,
             gap: Vec2(x: 0.0, y: 12.0),
@@ -32,7 +32,7 @@
         hook: Hook(parent_anchor: TR, self_anchor: TL),
         offset: Vec2(x: 0.0, y: 0.0),
         params: ScrollingTextBlock((
-            color: Color(hex: "<% opt.catppuccin.red %>"),
+            color: Color(hex: "#<% opt.catppuccin.red %>"),
             ellipsize: End,
             font: "<% opt.font %> Bold 12",
             lhs_dist: 25.0,
@@ -52,7 +52,7 @@
         offset: Vec2(x: 0.0, y: 0.0),
         params: TextBlock((
             text: "%b",
-            color: Color(hex: "<% opt.catppuccin.text %>"),
+            color: Color(hex: "#<% opt.catppuccin.text %>"),
             ellipsize: End,
             font: "<% opt.font %> Bold 12",
             padding: Padding(left: 8.0, right: 8.0, top: 0.0, bottom: 8.0),
@@ -85,10 +85,10 @@
         render_criteria: [Or([Progress])],
         params: ProgressBlock((
             background_color: Color(hex: "#00000000"),
-            border_color: Color(hex: "<% opt.catppuccin.surface0 %>"),
+            border_color: Color(hex: "#<% opt.catppuccin.surface0 %>"),
             border_rounding: 0.0,
             border_width: 0.4,
-            fill_color: Color(hex: "<% opt.catppuccin.teal %>"),
+            fill_color: Color(hex: "#<% opt.catppuccin.teal %>"),
             fill_rounding: 0.0,
             height: 10.0,
             padding: Padding(left: 8.0, right: 8.0, top: 0.0, bottom: 8.0),
diff --git a/cg_opts.lua b/cg_opts.lua
index 750014e..ec632d1 100644
--- a/cg_opts.lua
+++ b/cg_opts.lua
@@ -63,32 +63,32 @@ opts.gamemode = {
 opts.dev_dir = os.getenv "HOME" .. "/dev"
 
 opts.catppuccin = {
-    base = "#1e1e2e",
-    blue = "#89b4fa",
-    crust = "#11111b",
-    flamingo = "#f2cdcd",
-    green = "#a6e3a1",
-    lavender = "#b4befe",
-    mantle = "#181825",
-    maroon = "#eba0ac",
-    mauve = "#cba6f7",
-    overlay0 = "#6c7086",
-    overlay1 = "#7f849c",
-    overlay2 = "#9399b2",
-    peach = "#fab387",
-    pink = "#f5c2e7",
-    red = "#f38ba8",
-    rosewater = "#f5e0dc",
-    sapphire = "#74c7ec",
-    sky = "#89dceb",
-    subtext0 = "#a6adc8",
-    subtext1 = "#bac2de",
-    surface0 = "#313244",
-    surface1 = "#45475a",
-    surface2 = "#585b70",
-    teal = "#94e2d5",
-    text = "#cdd6f4",
-    yellow = "#f9e2af",
+    base = "1e1e2e",
+    blue = "89b4fa",
+    crust = "11111b",
+    flamingo = "f2cdcd",
+    green = "a6e3a1",
+    lavender = "b4befe",
+    mantle = "181825",
+    maroon = "eba0ac",
+    mauve = "cba6f7",
+    overlay0 = "6c7086",
+    overlay1 = "7f849c",
+    overlay2 = "9399b2",
+    peach = "fab387",
+    pink = "f5c2e7",
+    red = "f38ba8",
+    rosewater = "f5e0dc",
+    sapphire = "74c7ec",
+    sky = "89dceb",
+    subtext0 = "a6adc8",
+    subtext1 = "bac2de",
+    surface0 = "313244",
+    surface1 = "45475a",
+    surface2 = "585b70",
+    teal = "94e2d5",
+    text = "cdd6f4",
+    yellow = "f9e2af",
 }
 
 return opts