From b17e240f876efcab5aa62c79e9727952cd0acaa5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 12:35:25 -0700 Subject: [PATCH] chore(deps): update dependency catppuccin/whiskers to v2.5.0 (#34) * chore(deps): update dependency catppuccin/whiskers to v2.5.0 * bump version in readme * update ignore * add test task * bump version * file not supported in zed * update readme --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Andrew Tec <21319730+tecandrew@users.noreply.github.com> --- .editorconfig | 34 ---------------------------------- .gitignore | 4 +++- .zed/tasks.json | 4 ++++ README.md | 13 +++++++------ extension.toml | 2 +- zed.tera | 2 +- 6 files changed, 16 insertions(+), 43 deletions(-) delete mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index d86ac02..0000000 --- a/.editorconfig +++ /dev/null @@ -1,34 +0,0 @@ -# EditorConfig helps developers define and maintain consistent -# coding styles between different editors and IDEs -# EditorConfig is awesome: https://EditorConfig.org - -root = true - -[*] -charset = utf-8 -indent_size = 2 -indent_style = space -end_of_line = lf -insert_final_newline = true -trim_trailing_whitespace = true - -# go -[*.go] -indent_style = tab -indent_size = 4 - -# python -[*.{ini,py,py.tpl,rst}] -indent_size = 4 - -# rust -[*.rs] -indent_size = 4 - -# documentation, utils -[*.{md,mdx,diff}] -trim_trailing_whitespace = false - -# windows shell scripts -[*.{cmd,bat,ps1}] -end_of_line = crlf diff --git a/.gitignore b/.gitignore index 6a3e68d..ab68dd6 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -**/.DS_Store \ No newline at end of file +**/.DS_Store +themes/* +!themes/*mauve*.json diff --git a/.zed/tasks.json b/.zed/tasks.json index 1b8d01c..be00907 100644 --- a/.zed/tasks.json +++ b/.zed/tasks.json @@ -10,5 +10,9 @@ { "label": "clean", "command": "rm themes/*.json" + }, + { + "label": "test", + "command": "whiskers zed.tera -o json --overrides '{\"accent\": \"mauve\"}' --check themes/catppuccin-mauve.json" } ] diff --git a/README.md b/README.md index 1a30abf..e2bff3f 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ 3. Select _Catppuccin Themes_ and Install 4. Select your Catppuccin theme in the dropdown shown after hitting `cmd+k`, `cmd+t` -### 🎨 Install Different Accents +### 🎨 Installing Different Catpuccin Flavor Accents
@@ -64,24 +64,25 @@
1. Install [Rust](https://www.rust-lang.org/tools/install) -2. Install [`whiskers`](https://crates.io/crates/catppuccin-whiskers) (>= 2.4.0) +2. Install [`whiskers`](https://crates.io/crates/catppuccin-whiskers) (>= 2.5.0) ```bash - cargo install catppuccin-whiskers@2.4.0 + # brew install catppuccin/tap/whiskers + cargo install catppuccin-whiskers@2.5.0 ``` -3. Test and check changes against current `themes/catppuccin.json` theme +3. Test and check changes against current `mauve` accent theme ```bash # returns nothing if OK whiskers zed.tera -o json --overrides '{"accent": "mauve"}' --check themes/catppuccin-mauve.json ``` -4. Build the zed extension `.json` theme file (mauve accent only) +4. Build the `.json` theme file ```bash whiskers zed.tera -o json --overrides '{"accent": ["mauve"]}' - whiskers zed.tera -o json --overrides '{"accent": ["mauve","lavender"]}' + # whiskers zed.tera -o json --overrides '{"accent": ["mauve","lavender"]}' ... ``` diff --git a/extension.toml b/extension.toml index e51e8f8..21c7d60 100644 --- a/extension.toml +++ b/extension.toml @@ -1,7 +1,7 @@ id = "catppuccin" name = "Catppuccin Themes" schema_version = 1 -version = "0.2.10" +version = "0.2.11" authors = ["Andrew Tec "] description = "🦀 Soothing pastel theme for Zed" repository = "https://github.com/catppuccin/zed" diff --git a/zed.tera b/zed.tera index 3b1070a..0af9f2a 100644 --- a/zed.tera +++ b/zed.tera @@ -1,6 +1,6 @@ --- whiskers: - version: "2.4.0" + version: 2.5.0 matrix: - variant: ["", "-no-italics"] - flavor