feat: use whiskers template (#7)

catppuccin · Mar 31, 2024 · 13d7b4e · 13d7b4e
1 parent fc22873
commit 13d7b4e
Show file tree

Hide file tree

Showing 7 changed files with 343 additions and 243 deletions.
diff --git a/README.md b/README.md
@@ -35,13 +35,13 @@
 </details>
 
 ## Usage
+
 1. Download the file with your desired flavour e.g. `mocha.conf` (to be found in the [release](https://github.com/catppuccin/hyprland/releases/latest) or after cloning the repository in `themes/`)
 2. Copy it into your hyprland config e.g. `~/.config/hypr/`
 3. Include the file at the top of your `hyprland.conf`
-   - `source=~/.config/hypr/mocha.conf` 
+   - `source=~/.config/hypr/mocha.conf`
 4. When using the non-alpha colors, use `$COLOR` e.g. `$base`
-5. When using the alpha colors use something like `0xff$COLORAlpha` e.g. `0xff$surface0Alpha`
-
+5. When using the alpha colors use something like `rgba($COLORAlpha<transparency>)` e.g. `rgba($surface0Alphaee)`
 
 ## 🙋 FAQ
 

diff --git a/hyprland.tera b/hyprland.tera
@@ -0,0 +1,12 @@
+---
+whiskers:
+    version: "2.0.0"
+    matrix:
+        - flavor
+    filename: "themes/{{flavor.identifier}}.conf"
+---
+
+{% for name, color in flavor.colors %}
+${{ name }} = rgb({{ color.hex }})
+${{ name }}Alpha = {{ color.hex }}
+{% endfor %}
diff --git a/justfile b/justfile
@@ -0,0 +1,20 @@
+# Print out all recipes when running `just`
+_default:
+    @just --list
+
+# Variables
+output := "themes"
+whiskers_cmd := "whiskers"
+template_path := "hyprland.tera"
+
+# Create the output directory
+setup:
+    mkdir -p {{output}}
+
+# Remove all files in the output directory
+clean:
+    rm -fv {{output}}/*.conf
+
+# Generate all four flavors
+all: setup
+    {{whiskers_cmd}} {{template_path}}
diff --git a/themes/frappe.conf b/themes/frappe.conf
@@ -1,61 +1,78 @@
+
+$rosewater = rgb(f2d5cf)
 $rosewaterAlpha = f2d5cf
-$flamingoAlpha  = eebebe
-$pinkAlpha      = f4b8e4
-$mauveAlpha     = ca9ee6
-$redAlpha       = e78284
-$maroonAlpha    = ea999c
-$peachAlpha     = ef9f76
-$yellowAlpha    = e5c890
-$greenAlpha     = a6d189
-$tealAlpha      = 81c8be
-$skyAlpha       = 99d1db
-$sapphireAlpha  = 85c1dc
-$blueAlpha      = 8caaee
-$lavenderAlpha  = babbf1
-
-$textAlpha      = c6d0f5
-$subtext1Alpha  = b5bfe2
-$subtext0Alpha  = a5adce
-
-$overlay2Alpha  = 949cbb
-$overlay1Alpha  = 838ba7
-$overlay0Alpha  = 737994
-
-$surface2Alpha  = 626880
-$surface1Alpha  = 51576d
-$surface0Alpha  = 414559
-
-$baseAlpha      = 303446
-$mantleAlpha    = 292c3c
-$crustAlpha     = 232634
-
-$rosewater = 0xfff2d5cf
-$flamingo  = 0xffeebebe
-$pink      = 0xfff4b8e4
-$mauve     = 0xffca9ee6
-$red       = 0xffe78284
-$maroon    = 0xffea999c
-$peach     = 0xffef9f76
-$yellow    = 0xffe5c890
-$green     = 0xffa6d189
-$teal      = 0xff81c8be
-$sky       = 0xff99d1db
-$sapphire  = 0xff85c1dc
-$blue      = 0xff8caaee
-$lavender  = 0xffbabbf1
-
-$text      = 0xffc6d0f5
-$subtext1  = 0xffb5bfe2
-$subtext0  = 0xffa5adce
-
-$overlay2  = 0xff949cbb
-$overlay1  = 0xff838ba7
-$overlay0  = 0xff737994
-
-$surface2  = 0xff626880
-$surface1  = 0xff51576d
-$surface0  = 0xff414559
-
-$base      = 0xff303446
-$mantle    = 0xff292c3c
-$crust     = 0xff232634
+
+$flamingo = rgb(eebebe)
+$flamingoAlpha = eebebe
+
+$pink = rgb(f4b8e4)
+$pinkAlpha = f4b8e4
+
+$mauve = rgb(ca9ee6)
+$mauveAlpha = ca9ee6
+
+$red = rgb(e78284)
+$redAlpha = e78284
+
+$maroon = rgb(ea999c)
+$maroonAlpha = ea999c
+
+$peach = rgb(ef9f76)
+$peachAlpha = ef9f76
+
+$yellow = rgb(e5c890)
+$yellowAlpha = e5c890
+
+$green = rgb(a6d189)
+$greenAlpha = a6d189
+
+$teal = rgb(81c8be)
+$tealAlpha = 81c8be
+
+$sky = rgb(99d1db)
+$skyAlpha = 99d1db
+
+$sapphire = rgb(85c1dc)
+$sapphireAlpha = 85c1dc
+
+$blue = rgb(8caaee)
+$blueAlpha = 8caaee
+
+$lavender = rgb(babbf1)
+$lavenderAlpha = babbf1
+
+$text = rgb(c6d0f5)
+$textAlpha = c6d0f5
+
+$subtext1 = rgb(b5bfe2)
+$subtext1Alpha = b5bfe2
+
+$subtext0 = rgb(a5adce)
+$subtext0Alpha = a5adce
+
+$overlay2 = rgb(949cbb)
+$overlay2Alpha = 949cbb
+
+$overlay1 = rgb(838ba7)
+$overlay1Alpha = 838ba7
+
+$overlay0 = rgb(737994)
+$overlay0Alpha = 737994
+
+$surface2 = rgb(626880)
+$surface2Alpha = 626880
+
+$surface1 = rgb(51576d)
+$surface1Alpha = 51576d
+
+$surface0 = rgb(414559)
+$surface0Alpha = 414559
+
+$base = rgb(303446)
+$baseAlpha = 303446
+
+$mantle = rgb(292c3c)
+$mantleAlpha = 292c3c
+
+$crust = rgb(232634)
+$crustAlpha = 232634
diff --git a/themes/latte.conf b/themes/latte.conf
@@ -1,61 +1,78 @@
+
+$rosewater = rgb(dc8a78)
 $rosewaterAlpha = dc8a78
-$flamingoAlpha  = dd7878
-$pinkAlpha      = ea76cb
-$mauveAlpha     = 8839ef
-$redAlpha       = d20f39
-$maroonAlpha    = e64553
-$peachAlpha     = fe640b
-$yellowAlpha    = df8e1d
-$greenAlpha     = 40a02b
-$tealAlpha      = 179299
-$skyAlpha       = 04a5e5
-$sapphireAlpha  = 209fb5
-$blueAlpha      = 1e66f5
-$lavenderAlpha  = 7287fd
-
-$textAlpha      = 4c4f69
-$subtext1Alpha  = 5c5f77
-$subtext0Alpha  = 6c6f85
-
-$overlay2Alpha  = 7c7f93
-$overlay1Alpha  = 8c8fa1
-$overlay0Alpha  = 9ca0b0
-
-$surface2Alpha  = acb0be
-$surface1Alpha  = bcc0cc
-$surface0Alpha  = ccd0da
-
-$baseAlpha      = eff1f5
-$mantleAlpha    = e6e9ef
-$crustAlpha     = dce0e8
-
-$rosewater = 0xffdc8a78
-$flamingo  = 0xffdd7878
-$pink      = 0xffea76cb
-$mauve     = 0xff8839ef
-$red       = 0xffd20f39
-$maroon    = 0xffe64553
-$peach     = 0xfffe640b
-$yellow    = 0xffdf8e1d
-$green     = 0xff40a02b
-$teal      = 0xff179299
-$sky       = 0xff04a5e5
-$sapphire  = 0xff209fb5
-$blue      = 0xff1e66f5
-$lavender  = 0xff7287fd
-
-$text      = 0xff4c4f69
-$subtext1  = 0xff5c5f77
-$subtext0  = 0xff6c6f85
-
-$overlay2  = 0xff7c7f93
-$overlay1  = 0xff8c8fa1
-$overlay0  = 0xff9ca0b0
-
-$surface2  = 0xffacb0be
-$surface1  = 0xffbcc0cc
-$surface0  = 0xffccd0da
-
-$base      = 0xffeff1f5
-$mantle    = 0xffe6e9ef
-$crust     = 0xffdce0e8
+
+$flamingo = rgb(dd7878)
+$flamingoAlpha = dd7878
+
+$pink = rgb(ea76cb)
+$pinkAlpha = ea76cb
+
+$mauve = rgb(8839ef)
+$mauveAlpha = 8839ef
+
+$red = rgb(d20f39)
+$redAlpha = d20f39
+
+$maroon = rgb(e64553)
+$maroonAlpha = e64553
+
+$peach = rgb(fe640b)
+$peachAlpha = fe640b
+
+$yellow = rgb(df8e1d)
+$yellowAlpha = df8e1d
+
+$green = rgb(40a02b)
+$greenAlpha = 40a02b
+
+$teal = rgb(179299)
+$tealAlpha = 179299
+
+$sky = rgb(04a5e5)
+$skyAlpha = 04a5e5
+
+$sapphire = rgb(209fb5)
+$sapphireAlpha = 209fb5
+
+$blue = rgb(1e66f5)
+$blueAlpha = 1e66f5
+
+$lavender = rgb(7287fd)
+$lavenderAlpha = 7287fd
+
+$text = rgb(4c4f69)
+$textAlpha = 4c4f69
+
+$subtext1 = rgb(5c5f77)
+$subtext1Alpha = 5c5f77
+
+$subtext0 = rgb(6c6f85)
+$subtext0Alpha = 6c6f85
+
+$overlay2 = rgb(7c7f93)
+$overlay2Alpha = 7c7f93
+
+$overlay1 = rgb(8c8fa1)
+$overlay1Alpha = 8c8fa1
+
+$overlay0 = rgb(9ca0b0)
+$overlay0Alpha = 9ca0b0
+
+$surface2 = rgb(acb0be)
+$surface2Alpha = acb0be
+
+$surface1 = rgb(bcc0cc)
+$surface1Alpha = bcc0cc
+
+$surface0 = rgb(ccd0da)
+$surface0Alpha = ccd0da
+
+$base = rgb(eff1f5)
+$baseAlpha = eff1f5
+
+$mantle = rgb(e6e9ef)
+$mantleAlpha = e6e9ef
+
+$crust = rgb(dce0e8)
+$crustAlpha = dce0e8