refactor: clean up whiskers build process (#43)

catppuccin · Jun 4, 2024 · 21a25af · 21a25af
1 parent 16dcbfc
commit 21a25af
Show file tree

Hide file tree

Showing 116 changed files with 128 additions and 172 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -25,7 +25,7 @@ jobs:
         if: ${{ steps.release.outputs.release_created }}
 
       - run: |
-          curl -fsSL https://github.com/catppuccin/toolbox/releases/download/whiskers-v2.1.0/whiskers-x86_64-unknown-linux-gnu -o $RUNNER_TEMP/whiskers
+          curl -fsSL https://github.com/catppuccin/toolbox/releases/download/whiskers-v2.3.0/whiskers-x86_64-unknown-linux-gnu -o $RUNNER_TEMP/whiskers
           chmod +x $RUNNER_TEMP/whiskers
           echo $RUNNER_TEMP >> $GITHUB_PATH
         if: ${{ steps.release.outputs.release_created }}

diff --git a/flake.lock b/flake.lock
diff --git a/justfile b/justfile
@@ -1,32 +1,5 @@
-# Default help menu
 _default:
   @just --list
 
-whiskers_cmd := "whiskers"
-template_path := "lazygit.tera"
-
-output_base := "themes"
-other_output_base := "themes-mergable"
-
-# Setup the output location
-setup:
-  mkdir -p {{output_base}}
-  mkdir -p {{output_base}}/mocha
-  mkdir -p {{output_base}}/macchiato
-  mkdir -p {{output_base}}/latte
-  mkdir -p {{output_base}}/frappe
-
-  mkdir -p {{other_output_base}}
-  mkdir -p {{other_output_base}}/mocha
-  mkdir -p {{other_output_base}}/macchiato
-  mkdir -p {{other_output_base}}/latte
-  mkdir -p {{other_output_base}}/frappe
-
-# Teardown the output location
-clean:
-  rm -r {{output_base}}
-  rm -r {{other_output_base}}
-
-# Generate all flavors with their accents
-all: setup 
-  whiskers {{template_path}}
+build:
+  whiskers lazygit.tera
diff --git a/lazygit.tera b/lazygit.tera
@@ -1,14 +1,15 @@
 ---
 whiskers:
-  version: 2.0.0
+  version: 2.3.0
   matrix:
     - variant: ["themes", "themes-mergable"]
     - flavor
     - accent
   filename: "{{variant}}/{{flavor.identifier}}/{{accent}}.yml"
 ---
+
+{%- macro theme() %}
 {%- set palette = flavor.colors -%}
-{%- if variant == "themes" -%} {#- Variant for copy/pasting into user config -#}
 theme:
   activeBorderColor:
     - '#{{ palette[accent].hex }}'
@@ -32,29 +33,11 @@ theme:
 
 authorColors:
   '*': '#{{ palette.lavender.hex }}'
-{%- else -%} {#- Variant for merging configs together -#}
-gui:
-  theme:
-    activeBorderColor:
-      - '#{{ palette[accent].hex }}'
-      - bold
-    inactiveBorderColor:
-      - '#{{ palette.subtext0.hex }}'
-    optionsTextColor:
-      - '#{{ palette.blue.hex }}'
-    selectedLineBgColor:
-      - '#{{ palette.surface0.hex }}'
-    cherryPickedCommitBgColor:
-      - '#{{ palette.surface1.hex }}'
-    cherryPickedCommitFgColor:
-      - '#{{ palette[accent].hex }}'
-    unstagedChangesColor:
-      - '#{{ palette.red.hex }}'
-    defaultFgColor:
-      - '#{{ palette.text.hex }}'
-    searchingActiveBorderColor:
-      - '#{{ palette.yellow.hex }}'
+{%- endmacro %}
 
-  authorColors:
-    '*': '#{{ palette.lavender.hex }}'
-{%- endif %}
+{%- if variant == "themes" -%}
+{{ self::theme() }}
+{%- else -%}
+gui:
+  {{ self::theme() | indent(prefix="  ") }}
+{%- endif %}
diff --git a/themes-mergable/frappe/blue.yml b/themes-mergable/frappe/blue.yml
@@ -21,4 +21,4 @@ gui:
       - '#e5c890'
 
   authorColors:
-    '*': '#babbf1'
+    '*': '#babbf1'
diff --git a/themes-mergable/frappe/flamingo.yml b/themes-mergable/frappe/flamingo.yml
@@ -21,4 +21,4 @@ gui:
       - '#e5c890'
 
   authorColors:
-    '*': '#babbf1'
+    '*': '#babbf1'
diff --git a/themes-mergable/frappe/green.yml b/themes-mergable/frappe/green.yml
@@ -21,4 +21,4 @@ gui:
       - '#e5c890'
 
   authorColors:
-    '*': '#babbf1'
+    '*': '#babbf1'
diff --git a/themes-mergable/frappe/lavender.yml b/themes-mergable/frappe/lavender.yml
@@ -21,4 +21,4 @@ gui:
       - '#e5c890'
 
   authorColors:
-    '*': '#babbf1'
+    '*': '#babbf1'
diff --git a/themes-mergable/frappe/maroon.yml b/themes-mergable/frappe/maroon.yml
@@ -21,4 +21,4 @@ gui:
       - '#e5c890'
 
   authorColors:
-    '*': '#babbf1'
+    '*': '#babbf1'
diff --git a/themes-mergable/frappe/mauve.yml b/themes-mergable/frappe/mauve.yml
@@ -21,4 +21,4 @@ gui:
       - '#e5c890'
 
   authorColors:
-    '*': '#babbf1'
+    '*': '#babbf1'
diff --git a/themes-mergable/frappe/peach.yml b/themes-mergable/frappe/peach.yml
@@ -21,4 +21,4 @@ gui:
       - '#e5c890'
 
   authorColors:
-    '*': '#babbf1'
+    '*': '#babbf1'
diff --git a/themes-mergable/frappe/pink.yml b/themes-mergable/frappe/pink.yml
@@ -21,4 +21,4 @@ gui:
       - '#e5c890'
 
   authorColors:
-    '*': '#babbf1'
+    '*': '#babbf1'
diff --git a/themes-mergable/frappe/red.yml b/themes-mergable/frappe/red.yml
@@ -21,4 +21,4 @@ gui:
       - '#e5c890'
 
   authorColors:
-    '*': '#babbf1'
+    '*': '#babbf1'
diff --git a/themes-mergable/frappe/rosewater.yml b/themes-mergable/frappe/rosewater.yml
@@ -21,4 +21,4 @@ gui:
       - '#e5c890'
 
   authorColors:
-    '*': '#babbf1'
+    '*': '#babbf1'
diff --git a/themes-mergable/frappe/sapphire.yml b/themes-mergable/frappe/sapphire.yml
@@ -21,4 +21,4 @@ gui:
       - '#e5c890'
 
   authorColors:
-    '*': '#babbf1'
+    '*': '#babbf1'
diff --git a/themes-mergable/frappe/sky.yml b/themes-mergable/frappe/sky.yml
@@ -21,4 +21,4 @@ gui:
       - '#e5c890'
 
   authorColors:
-    '*': '#babbf1'
+    '*': '#babbf1'
diff --git a/themes-mergable/frappe/teal.yml b/themes-mergable/frappe/teal.yml
@@ -21,4 +21,4 @@ gui:
       - '#e5c890'
 
   authorColors:
-    '*': '#babbf1'
+    '*': '#babbf1'
diff --git a/themes-mergable/frappe/yellow.yml b/themes-mergable/frappe/yellow.yml
@@ -21,4 +21,4 @@ gui:
       - '#e5c890'
 
   authorColors:
-    '*': '#babbf1'
+    '*': '#babbf1'
diff --git a/themes-mergable/latte/blue.yml b/themes-mergable/latte/blue.yml
@@ -21,4 +21,4 @@ gui:
       - '#df8e1d'
 
   authorColors:
-    '*': '#7287fd'
+    '*': '#7287fd'
diff --git a/themes-mergable/latte/flamingo.yml b/themes-mergable/latte/flamingo.yml
@@ -21,4 +21,4 @@ gui:
       - '#df8e1d'
 
   authorColors:
-    '*': '#7287fd'
+    '*': '#7287fd'
diff --git a/themes-mergable/latte/green.yml b/themes-mergable/latte/green.yml
@@ -21,4 +21,4 @@ gui:
       - '#df8e1d'
 
   authorColors:
-    '*': '#7287fd'
+    '*': '#7287fd'
diff --git a/themes-mergable/latte/lavender.yml b/themes-mergable/latte/lavender.yml
@@ -21,4 +21,4 @@ gui:
       - '#df8e1d'
 
   authorColors:
-    '*': '#7287fd'
+    '*': '#7287fd'
diff --git a/themes-mergable/latte/maroon.yml b/themes-mergable/latte/maroon.yml
@@ -21,4 +21,4 @@ gui:
       - '#df8e1d'
 
   authorColors:
-    '*': '#7287fd'
+    '*': '#7287fd'
diff --git a/themes-mergable/latte/mauve.yml b/themes-mergable/latte/mauve.yml
@@ -21,4 +21,4 @@ gui:
       - '#df8e1d'
 
   authorColors:
-    '*': '#7287fd'
+    '*': '#7287fd'
diff --git a/themes-mergable/latte/peach.yml b/themes-mergable/latte/peach.yml
@@ -21,4 +21,4 @@ gui:
       - '#df8e1d'
 
   authorColors:
-    '*': '#7287fd'
+    '*': '#7287fd'
diff --git a/themes-mergable/latte/pink.yml b/themes-mergable/latte/pink.yml
@@ -21,4 +21,4 @@ gui:
       - '#df8e1d'
 
   authorColors:
-    '*': '#7287fd'
+    '*': '#7287fd'
diff --git a/themes-mergable/latte/red.yml b/themes-mergable/latte/red.yml
@@ -21,4 +21,4 @@ gui:
       - '#df8e1d'
 
   authorColors:
-    '*': '#7287fd'
+    '*': '#7287fd'
diff --git a/themes-mergable/latte/rosewater.yml b/themes-mergable/latte/rosewater.yml
@@ -21,4 +21,4 @@ gui:
       - '#df8e1d'
 
   authorColors:
-    '*': '#7287fd'
+    '*': '#7287fd'
diff --git a/themes-mergable/latte/sapphire.yml b/themes-mergable/latte/sapphire.yml
@@ -21,4 +21,4 @@ gui:
       - '#df8e1d'
 
   authorColors:
-    '*': '#7287fd'
+    '*': '#7287fd'
diff --git a/themes-mergable/latte/sky.yml b/themes-mergable/latte/sky.yml
@@ -21,4 +21,4 @@ gui:
       - '#df8e1d'
 
   authorColors:
-    '*': '#7287fd'
+    '*': '#7287fd'
diff --git a/themes-mergable/latte/teal.yml b/themes-mergable/latte/teal.yml
@@ -21,4 +21,4 @@ gui:
       - '#df8e1d'
 
   authorColors:
-    '*': '#7287fd'
+    '*': '#7287fd'
diff --git a/themes-mergable/latte/yellow.yml b/themes-mergable/latte/yellow.yml
@@ -21,4 +21,4 @@ gui:
       - '#df8e1d'
 
   authorColors:
-    '*': '#7287fd'
+    '*': '#7287fd'
diff --git a/themes-mergable/macchiato/blue.yml b/themes-mergable/macchiato/blue.yml
@@ -21,4 +21,4 @@ gui:
       - '#eed49f'
 
   authorColors:
-    '*': '#b7bdf8'
+    '*': '#b7bdf8'
diff --git a/themes-mergable/macchiato/flamingo.yml b/themes-mergable/macchiato/flamingo.yml
@@ -21,4 +21,4 @@ gui:
       - '#eed49f'
 
   authorColors:
-    '*': '#b7bdf8'
+    '*': '#b7bdf8'
diff --git a/themes-mergable/macchiato/green.yml b/themes-mergable/macchiato/green.yml
@@ -21,4 +21,4 @@ gui:
       - '#eed49f'
 
   authorColors:
-    '*': '#b7bdf8'
+    '*': '#b7bdf8'
diff --git a/themes-mergable/macchiato/lavender.yml b/themes-mergable/macchiato/lavender.yml
@@ -21,4 +21,4 @@ gui:
       - '#eed49f'
 
   authorColors:
-    '*': '#b7bdf8'
+    '*': '#b7bdf8'
diff --git a/themes-mergable/macchiato/maroon.yml b/themes-mergable/macchiato/maroon.yml
@@ -21,4 +21,4 @@ gui:
       - '#eed49f'
 
   authorColors:
-    '*': '#b7bdf8'
+    '*': '#b7bdf8'
diff --git a/themes-mergable/macchiato/mauve.yml b/themes-mergable/macchiato/mauve.yml
@@ -21,4 +21,4 @@ gui:
       - '#eed49f'
 
   authorColors:
-    '*': '#b7bdf8'
+    '*': '#b7bdf8'
diff --git a/themes-mergable/macchiato/peach.yml b/themes-mergable/macchiato/peach.yml
@@ -21,4 +21,4 @@ gui:
       - '#eed49f'
 
   authorColors:
-    '*': '#b7bdf8'
+    '*': '#b7bdf8'
diff --git a/themes-mergable/macchiato/pink.yml b/themes-mergable/macchiato/pink.yml
@@ -21,4 +21,4 @@ gui:
       - '#eed49f'
 
   authorColors:
-    '*': '#b7bdf8'
+    '*': '#b7bdf8'
diff --git a/themes-mergable/macchiato/red.yml b/themes-mergable/macchiato/red.yml
@@ -21,4 +21,4 @@ gui:
       - '#eed49f'
 
   authorColors:
-    '*': '#b7bdf8'
+    '*': '#b7bdf8'
diff --git a/themes-mergable/macchiato/rosewater.yml b/themes-mergable/macchiato/rosewater.yml
@@ -21,4 +21,4 @@ gui:
       - '#eed49f'
 
   authorColors:
-    '*': '#b7bdf8'
+    '*': '#b7bdf8'
diff --git a/themes-mergable/macchiato/sapphire.yml b/themes-mergable/macchiato/sapphire.yml
@@ -21,4 +21,4 @@ gui:
       - '#eed49f'
 
   authorColors:
-    '*': '#b7bdf8'
+    '*': '#b7bdf8'
diff --git a/themes-mergable/macchiato/sky.yml b/themes-mergable/macchiato/sky.yml
@@ -21,4 +21,4 @@ gui:
       - '#eed49f'
 
   authorColors:
-    '*': '#b7bdf8'
+    '*': '#b7bdf8'