From 8ccb5609145e2f8ce3ee2c1d69d5f9766e902c14 Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Wed, 22 May 2024 09:33:34 -0400
Subject: [PATCH 1/3] feat: whiskers

---
 justfile                                      |  5 +++
 tabby.tera                                    | 33 +++++++++++++++++++
 frappe.yaml => themes/catppuccin-frappe.yaml  |  2 +-
 latte.yaml => themes/catppuccin-latte.yaml    |  0
 .../catppuccin-macchiato.yaml                 |  6 ++--
 mocha.yaml => themes/catppuccin-mocha.yaml    |  0
 6 files changed, 42 insertions(+), 4 deletions(-)
 create mode 100644 justfile
 create mode 100644 tabby.tera
 rename frappe.yaml => themes/catppuccin-frappe.yaml (96%)
 rename latte.yaml => themes/catppuccin-latte.yaml (100%)
 rename macchiato.yaml => themes/catppuccin-macchiato.yaml (85%)
 rename mocha.yaml => themes/catppuccin-mocha.yaml (100%)

diff --git a/justfile b/justfile
new file mode 100644
index 0000000..9736c85
--- /dev/null
+++ b/justfile
@@ -0,0 +1,5 @@
+_default:
+  @just --list
+
+build:
+  whiskers tabby.tera
diff --git a/tabby.tera b/tabby.tera
new file mode 100644
index 0000000..d75f509
--- /dev/null
+++ b/tabby.tera
@@ -0,0 +1,33 @@
+---
+whiskers:
+  version: 2.1.0
+  matrix:
+    - flavor
+  filename: "themes/catppuccin-{{ flavor.identifier }}.yaml"
+---
+
+{%- set palette = flavor.colors -%}
+
+name: Catppuccin {{ flavor.name }}
+foreground: '#{{ palette.text.hex }}'
+background: '#{{ palette.base.hex }}'
+selection: null
+cursor: '#{{ palette.rosewater.hex }}'
+cursorAccent: null
+colors:
+  - '#{% if flavor.dark %}{{ palette.surface1.hex }}{% else %}{{ palette.subtext1.hex }}{% endif %}'
+  - '#{{ palette.red.hex }}'
+  - '#{{ palette.green.hex }}'
+  - '#{{ palette.yellow.hex }}'
+  - '#{{ palette.blue.hex }}'
+  - '#{{ palette.pink.hex }}'
+  - '#{{ palette.teal.hex }}'
+  - '#{% if flavor.dark %}{{ palette.subtext1.hex }}{% else %}{{ palette.surface2.hex }}{% endif %}'
+  - '#{% if flavor.dark %}{{ palette.surface2.hex }}{% else %}{{ palette.subtext0.hex }}{% endif %}'
+  - '#{{ palette.red.hex }}'
+  - '#{{ palette.green.hex }}'
+  - '#{{ palette.yellow.hex }}'
+  - '#{{ palette.blue.hex }}'
+  - '#{{ palette.pink.hex }}'
+  - '#{{ palette.teal.hex }}'
+  - '#{% if flavor.dark %}{{ palette.subtext0.hex }}{% else %}{{ palette.surface1.hex }}{% endif %}'
diff --git a/frappe.yaml b/themes/catppuccin-frappe.yaml
similarity index 96%
rename from frappe.yaml
rename to themes/catppuccin-frappe.yaml
index 942139d..1697eac 100644
--- a/frappe.yaml
+++ b/themes/catppuccin-frappe.yaml
@@ -13,7 +13,7 @@ colors:
   - '#f4b8e4'
   - '#81c8be'
   - '#b5bfe2'
-  - '#51576d'
+  - '#626880'
   - '#e78284'
   - '#a6d189'
   - '#e5c890'
diff --git a/latte.yaml b/themes/catppuccin-latte.yaml
similarity index 100%
rename from latte.yaml
rename to themes/catppuccin-latte.yaml
diff --git a/macchiato.yaml b/themes/catppuccin-macchiato.yaml
similarity index 85%
rename from macchiato.yaml
rename to themes/catppuccin-macchiato.yaml
index 08b7459..0123200 100644
--- a/macchiato.yaml
+++ b/themes/catppuccin-macchiato.yaml
@@ -1,12 +1,12 @@
 name: Catppuccin Macchiato
-foreground: '#cdd6f4'
+foreground: '#cad3f5'
 background: '#24273a'
 selection: null
 cursor: '#f4dbd6'
 cursorAccent: null
 colors:
   - '#494d64'
-  - '#f38ba8'
+  - '#ed8796'
   - '#a6da95'
   - '#eed49f'
   - '#8aadf4'
@@ -14,7 +14,7 @@ colors:
   - '#8bd5ca'
   - '#b8c0e0'
   - '#5b6078'
-  - '#f38ba8'
+  - '#ed8796'
   - '#a6da95'
   - '#eed49f'
   - '#8aadf4'
diff --git a/mocha.yaml b/themes/catppuccin-mocha.yaml
similarity index 100%
rename from mocha.yaml
rename to themes/catppuccin-mocha.yaml

From 37b6491c638074dc35723b2a965cd5dce705e019 Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Sun, 26 May 2024 19:52:28 -0400
Subject: [PATCH 2/3] refactor: remove usage of palette variable

---
 tabby.tera | 43 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/tabby.tera b/tabby.tera
index d75f509..971311d 100644
--- a/tabby.tera
+++ b/tabby.tera
@@ -1,33 +1,30 @@
 ---
 whiskers:
-  version: 2.1.0
+  version: "2.2.0"
   matrix:
     - flavor
   filename: "themes/catppuccin-{{ flavor.identifier }}.yaml"
 ---
-
-{%- set palette = flavor.colors -%}
-
 name: Catppuccin {{ flavor.name }}
-foreground: '#{{ palette.text.hex }}'
-background: '#{{ palette.base.hex }}'
+foreground: '#{{ text.hex }}'
+background: '#{{ base.hex }}'
 selection: null
-cursor: '#{{ palette.rosewater.hex }}'
+cursor: '#{{ rosewater.hex }}'
 cursorAccent: null
 colors:
-  - '#{% if flavor.dark %}{{ palette.surface1.hex }}{% else %}{{ palette.subtext1.hex }}{% endif %}'
-  - '#{{ palette.red.hex }}'
-  - '#{{ palette.green.hex }}'
-  - '#{{ palette.yellow.hex }}'
-  - '#{{ palette.blue.hex }}'
-  - '#{{ palette.pink.hex }}'
-  - '#{{ palette.teal.hex }}'
-  - '#{% if flavor.dark %}{{ palette.subtext1.hex }}{% else %}{{ palette.surface2.hex }}{% endif %}'
-  - '#{% if flavor.dark %}{{ palette.surface2.hex }}{% else %}{{ palette.subtext0.hex }}{% endif %}'
-  - '#{{ palette.red.hex }}'
-  - '#{{ palette.green.hex }}'
-  - '#{{ palette.yellow.hex }}'
-  - '#{{ palette.blue.hex }}'
-  - '#{{ palette.pink.hex }}'
-  - '#{{ palette.teal.hex }}'
-  - '#{% if flavor.dark %}{{ palette.subtext0.hex }}{% else %}{{ palette.surface1.hex }}{% endif %}'
+  - '#{% if flavor.dark %}{{ surface1.hex }}{% else %}{{ subtext1.hex }}{% endif %}'
+  - '#{{ red.hex }}'
+  - '#{{ green.hex }}'
+  - '#{{ yellow.hex }}'
+  - '#{{ blue.hex }}'
+  - '#{{ pink.hex }}'
+  - '#{{ teal.hex }}'
+  - '#{% if flavor.dark %}{{ subtext1.hex }}{% else %}{{ surface2.hex }}{% endif %}'
+  - '#{% if flavor.dark %}{{ surface2.hex }}{% else %}{{ subtext0.hex }}{% endif %}'
+  - '#{{ red.hex }}'
+  - '#{{ green.hex }}'
+  - '#{{ yellow.hex }}'
+  - '#{{ blue.hex }}'
+  - '#{{ pink.hex }}'
+  - '#{{ teal.hex }}'
+  - '#{% if flavor.dark %}{{ subtext0.hex }}{% else %}{{ surface1.hex }}{% endif %}'

From 00ab5343f7bbdb1167dec68e0845a3344be6b36d Mon Sep 17 00:00:00 2001
From: uncenter <47499684+uncenter@users.noreply.github.com>
Date: Sun, 26 May 2024 19:52:35 -0400
Subject: [PATCH 3/3] style: add trailing newline

---
 themes/catppuccin-frappe.yaml    | 2 +-
 themes/catppuccin-latte.yaml     | 2 +-
 themes/catppuccin-macchiato.yaml | 2 +-
 themes/catppuccin-mocha.yaml     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/themes/catppuccin-frappe.yaml b/themes/catppuccin-frappe.yaml
index 1697eac..b5d3056 100644
--- a/themes/catppuccin-frappe.yaml
+++ b/themes/catppuccin-frappe.yaml
@@ -20,4 +20,4 @@ colors:
   - '#8caaee'
   - '#f4b8e4'
   - '#81c8be'
-  - '#a5adce'
\ No newline at end of file
+  - '#a5adce'
diff --git a/themes/catppuccin-latte.yaml b/themes/catppuccin-latte.yaml
index 45a6923..27e52bc 100644
--- a/themes/catppuccin-latte.yaml
+++ b/themes/catppuccin-latte.yaml
@@ -20,4 +20,4 @@ colors:
   - '#1e66f5'
   - '#ea76cb'
   - '#179299'
-  - '#bcc0cc'
\ No newline at end of file
+  - '#bcc0cc'
diff --git a/themes/catppuccin-macchiato.yaml b/themes/catppuccin-macchiato.yaml
index 0123200..de3e759 100644
--- a/themes/catppuccin-macchiato.yaml
+++ b/themes/catppuccin-macchiato.yaml
@@ -20,4 +20,4 @@ colors:
   - '#8aadf4'
   - '#f5bde6'
   - '#8bd5ca'
-  - '#a5adcb'
\ No newline at end of file
+  - '#a5adcb'
diff --git a/themes/catppuccin-mocha.yaml b/themes/catppuccin-mocha.yaml
index 4bdd074..a92e009 100644
--- a/themes/catppuccin-mocha.yaml
+++ b/themes/catppuccin-mocha.yaml
@@ -20,4 +20,4 @@ colors:
   - '#89b4fa'
   - '#f5c2e7'
   - '#94e2d5'
-  - '#a6adc8'
\ No newline at end of file
+  - '#a6adc8'