Merge branch 'main' into feat/ollama.com

.github/CODEOWNERS

@@ -72,7 +72,6 @@
 /styles/snapchat-web @itzTheMeow
 /styles/spotify-web @Tnixc
 /styles/stack-overflow @uncenter
-/styles/skiff @coopw1
 /styles/stylus @GitMuslim
 /styles/syncthing @BlankParticle
 /styles/tabnews @Guaxinim5573

.github/ISSUE_TEMPLATE/userstyle.yml

@@ -16,7 +16,7 @@ body:
       label: What userstyles are you seeing the problem on?
       description: "Don't worry about the `lbl:` prefix, it allows issues to be automatically labeled!"
       multiple: true
-      options: ["lbl:advent-of-code", "lbl:amplenote", "lbl:anilist", "lbl:arch-wiki", "lbl:boringproxy", "lbl:brave-search", "lbl:bsky", "lbl:bstats", "lbl:canvas-lms", "lbl:chatgpt", "lbl:chatreplay", "lbl:chess.com", "lbl:cinny", "lbl:codeberg", "lbl:cobalt", "lbl:crates.io", "lbl:crowdin", "lbl:deepl", "lbl:docs.rs", "lbl:duckduckgo", "lbl:ecosia", "lbl:elk", "lbl:freedesktop", "lbl:formative", "lbl:github", "lbl:gmail", "lbl:go.dev", "lbl:google", "lbl:google-drive", "lbl:google-photos", "lbl:graphite", "lbl:google-gemini", "lbl:hackage", "lbl:hacker-news", "lbl:holodex", "lbl:home-manager-options-search", "lbl:homepage", "lbl:hoppscotch", "lbl:hyperpipe", "lbl:ichi.moe", "lbl:inoreader", "lbl:instagram", "lbl:invidious", "lbl:invokeai", "lbl:keyoxide", "lbl:lastfm", "lbl:lemmy", "lbl:libreddit", "lbl:lichess", "lbl:lingva", "lbl:linkedin", "lbl:listenbrainz", "lbl:mastodon", "lbl:mdbook", "lbl:mdn", "lbl:modrinth", "lbl:microsoft-word", "lbl:migadu-webmail", "lbl:minesweeper", "lbl:nitter", "lbl:nixos-search", "lbl:nixos.wiki", "lbl:npm", "lbl:openmediavault", "lbl:paste.rs", "lbl:perplexity", "lbl:phanpy", "lbl:picrew", "lbl:pinterest", "lbl:planet-minecraft", "lbl:porkbun", "lbl:pronouns.page", "lbl:proton", "lbl:pypi", "lbl:quizlet", "lbl:raindrop", "lbl:reddit", "lbl:searxng", "lbl:shinigami-eyes", "lbl:snapchat-web", "lbl:spotify-web", "lbl:stack-overflow", "lbl:startpage", "lbl:skiff", "lbl:stylus", "lbl:substack", "lbl:syncthing", "lbl:tabnews", "lbl:tldraw", "lbl:trinket", "lbl:tuta", "lbl:twitch", "lbl:twitter", "lbl:vercel", "lbl:vikunja", "lbl:web.dev", "lbl:whatsapp-web", "lbl:wikipedia", "lbl:wikiwand", "lbl:youtube"]
+      options: ["lbl:advent-of-code", "lbl:amplenote", "lbl:anilist", "lbl:arch-wiki", "lbl:boringproxy", "lbl:brave-search", "lbl:bsky", "lbl:bstats", "lbl:canvas-lms", "lbl:chatgpt", "lbl:chatreplay", "lbl:chess.com", "lbl:cinny", "lbl:codeberg", "lbl:cobalt", "lbl:crates.io", "lbl:crowdin", "lbl:deepl", "lbl:docs.rs", "lbl:duckduckgo", "lbl:ecosia", "lbl:elk", "lbl:freedesktop", "lbl:formative", "lbl:github", "lbl:gmail", "lbl:go.dev", "lbl:google", "lbl:google-drive", "lbl:google-photos", "lbl:graphite", "lbl:google-gemini", "lbl:hackage", "lbl:hacker-news", "lbl:holodex", "lbl:home-manager-options-search", "lbl:homepage", "lbl:hoppscotch", "lbl:hyperpipe", "lbl:ichi.moe", "lbl:inoreader", "lbl:instagram", "lbl:invidious", "lbl:invokeai", "lbl:keyoxide", "lbl:lastfm", "lbl:lemmy", "lbl:libreddit", "lbl:lichess", "lbl:lingva", "lbl:linkedin", "lbl:listenbrainz", "lbl:mastodon", "lbl:mdbook", "lbl:mdn", "lbl:modrinth", "lbl:microsoft-word", "lbl:migadu-webmail", "lbl:minesweeper", "lbl:nitter", "lbl:nixos-search", "lbl:nixos.wiki", "lbl:npm", "lbl:openmediavault", "lbl:paste.rs", "lbl:perplexity", "lbl:phanpy", "lbl:picrew", "lbl:pinterest", "lbl:planet-minecraft", "lbl:porkbun", "lbl:pronouns.page", "lbl:proton", "lbl:pypi", "lbl:quizlet", "lbl:raindrop", "lbl:reddit", "lbl:searxng", "lbl:shinigami-eyes", "lbl:snapchat-web", "lbl:spotify-web", "lbl:stack-overflow", "lbl:startpage", "lbl:stylus", "lbl:substack", "lbl:syncthing", "lbl:tabnews", "lbl:tldraw", "lbl:trinket", "lbl:tuta", "lbl:twitch", "lbl:twitter", "lbl:vercel", "lbl:vikunja", "lbl:web.dev", "lbl:whatsapp-web", "lbl:wikipedia", "lbl:wikiwand", "lbl:youtube"]
     validations:
       required: true
   - type: textarea

.github/PULL_REQUEST_TEMPLATE/userstyle-creation.md

@@ -26,7 +26,6 @@ Feel free to leave this section empty if you don't have anything more to say.
       [`userstyles.yml`](https://github.com/catppuccin/userstyles/blob/main/scripts/userstyles.yml)
       file with information about the new userstyle.
 - [ ] I have included the following files:
-  - `catppuccin.user.css` - all the CSS for the userstyle, based on the
-    template.
-  - `preview.webp` - composite image of all four individual flavor screenshots stitched together,
-    generated via [Catwalk](https://github.com/catppuccin/catwalk).
+  - [ ] `catppuccin.user.css` - all the CSS for the userstyle, based on the
+        template.
+  - [ ] `preview.webp` - composite image of all four individual flavor screenshots (taken with the default accent color of mauve) stitched together, generated via [Catwalk](https://github.com/catppuccin/catwalk).

.github/issue-labeler.yml

@@ -165,8 +165,6 @@ stack-overflow:
   - '/lbl:stack-overflow(,.*)?$/gm'
 startpage:
   - '/lbl:startpage(,.*)?$/gm'
-skiff:
-  - '/lbl:skiff(,.*)?$/gm'
 stylus:
   - '/lbl:stylus(,.*)?$/gm'
 substack:

.github/labels.yml

@@ -248,9 +248,6 @@
 - name: startpage
   description: Startpage
   color: '#b7bdf8'
-- name: skiff
-  description: Skiff
-  color: '#ee99a0'
 - name: stylus
   description: Stylus
   color: '#8bd5ca'

.github/pr-labeler.yml

@@ -82,7 +82,6 @@ snapchat-web: styles/snapchat-web/**/*
 spotify-web: styles/spotify-web/**/*
 stack-overflow: styles/stack-overflow/**/*
 startpage: styles/startpage/**/*
-skiff: styles/skiff/**/*
 stylus: styles/stylus/**/*
 substack: styles/substack/**/*
 syncthing: styles/syncthing/**/*

README.md

@@ -194,7 +194,6 @@ See [CONTRIBUTING.md](docs/CONTRIBUTING.md).
 
 - [Gmail](styles/gmail)
 - [Migadu Webmail](styles/migadu-webmail)
-- [Skiff](styles/skiff)
 - [Tuta](styles/tuta)
 
 </details>

deno.json

@@ -9,7 +9,7 @@
     "@std/fmt": "jsr:@std/fmt@^0.225.6",
     "@std/fs": "jsr:@std/fs@^1.0.1",
     "@std/path": "jsr:@std/path@^1.0.2",
-    "@std/yaml": "jsr:@std/yaml@^1.0.2",
+    "@std/yaml": "jsr:@std/yaml@^1.0.3",
     "ajv": "npm:[email protected]",
     "catppuccin-repo/": "https://raw.githubusercontent.com/catppuccin/catppuccin/d4f2666c2b04337f0a8632713de0889d9a7d332d/",
     "handlebars": "npm:[email protected]",

docs/userstyle-creation.md

@@ -44,7 +44,7 @@ To create a userstyle, follow the instructions below. If you run into any diffic
 6. Edit the [`userstyles.yml`](../scripts/userstyles.yml) file and put in the details
    of your port. **More details given in [`userstylesyml.md`](./userstylesyml.md).**
 7. Create your image preview.
-   - Take a screenshot of the themed website in each flavor, and then convert all four images [to WebP](./tips-and-tricks.md#how-do-i-convert-preview-images-to-webp) (e.g. `mocha.webp`,
+   - Take a screenshot of the themed website in each flavor, **with the accent set to `mauve` (the default)**, and then convert all four images [to WebP](./tips-and-tricks.md#how-do-i-convert-preview-images-to-webp) (e.g. `mocha.webp`,
      `macchiato.webp`, `frappe.webp` & `latte.webp`).
    - Use [Catwalk](https://github.com/catppuccin/catwalk) to generate a
      composite or grid image of all the images. **This must be saved as

scripts/import-styles/main.ts

@@ -18,6 +18,7 @@ const settings = {
     updateInterval: 24,
     updateOnlyEnabled: true,
     patchCsp: true,
+    "editor.linter": "",
   },
 };
 

scripts/userstyles.yml

@@ -826,14 +826,6 @@ userstyles:
       app-link: "https://startpage.com"
     current-maintainers: []
     past-maintainers: [*bartlibert]
-  skiff:
-    name: Skiff
-    categories: [email_client, productivity]
-    color: maroon
-    readme:
-      usage: "Switch to a default Skiff light/dark theme via **Settings** > **Appearance** for the best experience!"
-      app-link: "https://app.skiff.com/mail"
-    current-maintainers: [*coopw1]
   stylus:
     name: Stylus
     categories: [browser_extension]

shell.nix

@@ -1,14 +1,12 @@
 {
   deno,
-  typos,
   mkShellNoCC,
   nodePackages,
   ...
 }:
 mkShellNoCC {
   packages = [
     deno
-    typos
     nodePackages.prettier
   ];
 }

styles/chess.com/generate.py

@@ -0,0 +1,38 @@
+# /// script
+# requires-python = ">=3.11"
+# dependencies = [
+#     "boardinator==0.1.0",
+#     "catppuccin==2.1.0",
+# ]
+# ///
+import os
+from catppuccin import PALETTE
+from boardinator.boardinator import replace_colors
+
+cwd = os.getcwd()
+
+for flavor in PALETTE:
+    for color in flavor.colors:
+        if not color.accent:
+            continue
+        color_dict = {
+            # Light grayish yellow green
+            (237, 238, 209): (
+                flavor.colors.base.rgb.r,
+                flavor.colors.base.rgb.g,
+                flavor.colors.base.rgb.b,
+            ),
+            # Dark grayish yellow green
+            (119, 153, 82): (
+                color.rgb.r,
+                color.rgb.g,
+                color.rgb.b,
+            ),
+        }
+        replace_colors(
+            image_path=os.path.join(cwd, "assets/base/colorboard.png"),
+            output_path=os.path.join(
+                cwd, f"assets/{flavor.identifier}/{color.identifier}.png"
+            ),
+            color_dict=color_dict,
+        )