Merge branch 'main' into fix/github

Author: uncenter

.github/CODEOWNERS

@@ -21,6 +21,7 @@
 /styles/elk @ryanccn
 /styles/freedesktop @NK308
 /styles/formative @r58Playz
+/styles/ghostty.org @uncenter
 /styles/github @uncenter
 /styles/gmail @uncenter
 /styles/go.dev @Flapperoo

.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:alternativeto", "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:grabify", "lbl:graphite", "lbl:google-gemini", "lbl:hackage", "lbl:hacker-news", "lbl:have-i-been-pwned", "lbl:holodex", "lbl:home-manager-options-search", "lbl:homepage", "lbl:hoogle", "lbl:hoppscotch", "lbl:learn-x-in-y-minutes", "lbl:hyperpipe", "lbl:ichi.moe", "lbl:inoreader", "lbl:indie-wiki-buddy", "lbl:instagram", "lbl:invidious", "lbl:invokeai", "lbl:jisho", "lbl:keybr.com", "lbl:keyoxide", "lbl:lastfm", "lbl:lemmy", "lbl:libreddit", "lbl:lichess", "lbl:lingva", "lbl:linkedin", "lbl:listenbrainz", "lbl:lobste.rs", "lbl:mastodon", "lbl:mdbook", "lbl:mdn", "lbl:modrinth", "lbl:microsoft-word", "lbl:migadu-webmail", "lbl:minesweeper", "lbl:namemc", "lbl:nitter", "lbl:nixos-manual", "lbl:nixos-search", "lbl:wiki.nixos.org", "lbl:npm", "lbl:ollama", "lbl:openmediavault", "lbl:paste.rs", "lbl:perplexity", "lbl:phanpy", "lbl:picrew", "lbl:pinterest", "lbl:planet-minecraft", "lbl:porkbun", "lbl:pronouns.cc", "lbl:pronouns.page", "lbl:proton", "lbl:pypi", "lbl:pythonanywhere", "lbl:quizlet", "lbl:raindrop", "lbl:reddit", "lbl:rentry.co", "lbl:searxng", "lbl:shinigami-eyes", "lbl:snapchat-web", "lbl:spotify-web", "lbl:stack-overflow", "lbl:startpage", "lbl:status.cafe", "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:alternativeto", "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:ghostty.org", "lbl:github", "lbl:gmail", "lbl:go.dev", "lbl:google", "lbl:google-drive", "lbl:google-photos", "lbl:grabify", "lbl:graphite", "lbl:google-gemini", "lbl:hackage", "lbl:hacker-news", "lbl:have-i-been-pwned", "lbl:holodex", "lbl:home-manager-options-search", "lbl:homepage", "lbl:hoogle", "lbl:hoppscotch", "lbl:learn-x-in-y-minutes", "lbl:hyperpipe", "lbl:ichi.moe", "lbl:inoreader", "lbl:indie-wiki-buddy", "lbl:instagram", "lbl:invidious", "lbl:invokeai", "lbl:jisho", "lbl:keybr.com", "lbl:keyoxide", "lbl:lastfm", "lbl:lemmy", "lbl:libreddit", "lbl:lichess", "lbl:lingva", "lbl:linkedin", "lbl:listenbrainz", "lbl:lobste.rs", "lbl:mastodon", "lbl:mdbook", "lbl:mdn", "lbl:modrinth", "lbl:microsoft-word", "lbl:migadu-webmail", "lbl:minesweeper", "lbl:namemc", "lbl:nitter", "lbl:nixos-manual", "lbl:nixos-search", "lbl:wiki.nixos.org", "lbl:npm", "lbl:ollama", "lbl:openmediavault", "lbl:paste.rs", "lbl:perplexity", "lbl:phanpy", "lbl:picrew", "lbl:pinterest", "lbl:planet-minecraft", "lbl:porkbun", "lbl:pronouns.cc", "lbl:pronouns.page", "lbl:proton", "lbl:pypi", "lbl:pythonanywhere", "lbl:quizlet", "lbl:raindrop", "lbl:reddit", "lbl:rentry.co", "lbl:searxng", "lbl:shinigami-eyes", "lbl:snapchat-web", "lbl:spotify-web", "lbl:stack-overflow", "lbl:startpage", "lbl:status.cafe", "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-update.md

@@ -8,4 +8,3 @@ E.g. Fixes unthemed buttons on the home page.
 ## 🗒 Checklist 🗒
 
 - [ ] I have read and followed Catppuccin's [contributing guidelines](https://github.com/catppuccin/userstyles/blob/main/docs/CONTRIBUTING.md).
-- [ ] I have updated the version appropriately in the `==UserStyle==` header of the `catppuccin.user.css` file.

.github/issue-labeler.yml

@@ -49,6 +49,8 @@ freedesktop:
   - '/lbl:freedesktop(,.*)?$/gm'
 formative:
   - '/lbl:formative(,.*)?$/gm'
+ghostty.org:
+  - '/lbl:ghostty.org(,.*)?$/gm'
 github:
   - '/lbl:github(,.*)?$/gm'
 gmail:

.github/labels.yml

@@ -74,6 +74,9 @@
 - name: formative
   description: Formative
   color: '#8aadf4'
+- name: ghostty.org
+  description: Ghostty.org
+  color: '#8aadf4'
 - name: github
   description: GitHub
   color: '#cad3f5'

.github/pr-labeler.yml

@@ -24,6 +24,7 @@ ecosia: styles/ecosia/**/*
 elk: styles/elk/**/*
 freedesktop: styles/freedesktop/**/*
 formative: styles/formative/**/*
+ghostty.org: styles/ghostty.org/**/*
 github: styles/github/**/*
 gmail: styles/gmail/**/*
 go.dev: styles/go.dev/**/*

.github/workflows/generate-format.yml .github/workflows/ci.yml.github/workflows/generate-format.yml renamed to .github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Generate Health Files & Format
+name: CI
 
 on:
   workflow_dispatch:
@@ -9,37 +9,51 @@ env:
   HAS_USERSTYLES_TOKEN: ${{ secrets.USERSTYLES_TOKEN != '' }}
 
 jobs:
-  generate-health-files-and-format:
-    name: Generate health files & format
+  ci:
     runs-on: ubuntu-latest
     permissions:
       # Give the default GITHUB_TOKEN write permission to commit and push the
       # added or changed files to the repository.
       contents: write
 
+    # Prevent infinite loops by checking if the last commit was autogenerated.
+    if: ${{ github.event.commits[0].author.name != 'github-actions[bot]' }}
     steps:
       - uses: actions/checkout@v4
         if: env.HAS_USERSTYLES_TOKEN
         with:
           token: ${{ secrets.USERSTYLES_TOKEN }}
           ref: ${{ github.ref }}
+          fetch-depth: 2
       - uses: actions/checkout@v4
         if: env.HAS_USERSTYLES_TOKEN == 'false'
         with:
           ref: ${{ github.ref }}
+          fetch-depth: 2
 
       - name: Setup Deno
         uses: nekowinston/setup-deno@main
         with:
           deno-version: v2.1.3
 
-      - name: Generate health files
+      - name: Bump changed userstyles
+        run: |
+          git diff --name-only HEAD^1 HEAD | grep '^styles/.*catppuccin\.user\.css$' | xargs deno task bump
+
+      - name: Commit changes
+        uses: EndBug/add-and-commit@v9
+        with:
+          message: "chore: bump changed userstyles"
+          default_author: github_actions
+          push: false
+
+      - name: Update generated files
         run: deno task generate
 
       - name: Commit changes
         uses: EndBug/add-and-commit@v9
         with:
-          message: "chore: generate health files"
+          message: "chore: update generated files"
           default_author: github_actions
           push: false
 
@@ -49,7 +63,7 @@ jobs:
       - name: Commit changes
         uses: EndBug/add-and-commit@v9
         with:
-          message: "style: format code with prettier"
+          message: "style: format with prettier"
           default_author: github_actions
           push: false
 

README.md

@@ -63,6 +63,12 @@ To get started contributing to catppuccin/userstyles, see [Contributing](docs/CO
 - [Vercel, Next.js](styles/vercel)
 - [web.dev](styles/web.dev)
 
+</details>
+<details open>
+<summary>🌱 Terminals</summary>
+
+- [Ghostty.org](styles/ghostty.org)
+
 </details>
 <details open>
 <summary>🧩 Browser Extensions</summary>

deno.json

@@ -31,6 +31,7 @@
     "lint": "deno run -A ./scripts/lint/main.ts",
     "lint:fix": "deno task lint --fix",
     "update-types": "deno run -A ./scripts/types/update-types.ts",
+    "bump": "deno run -A ./scripts/bump-version/main.ts",
     "format": "deno run -A npm:prettier@3.2.4 --write ."
   },
   "nodeModulesDir": "auto",

docs/USAGE.md

@@ -8,7 +8,7 @@ For both of the below installation methods, you will need the Stylus browser ext
 ## All Userstyles
 
 1. Download the compiled Stylus export file, containing our recommended Stylus settings and all userstyles preloaded: [`import.json` (download)](https://github.com/catppuccin/userstyles/releases/download/all-userstyles-export/import.json).
-   - Alternatively, if you want more control over what is included in the `import.json` file, e.g. all userstyles with the accent color `peach`, you can download the Stylus export file from "[All Userstyles Import Generator](https://ctp-aui.uncenter.dev/)" by [@uncenter](https://github.com/uncenter) instead.
+   - Alternatively, if you want to further customize the `import.json` file - such as setting it so that all userstyles have the accent color `peach`, or the dark flavor is always `frappe` - you can download a customized Stylus export file from [@uncenter](https://github.com/uncenter)'s "[Catppuccin Userstyles Customizer](https://catppuccin-userstyles-customizer.uncenter.dev/)" instead.
 2. Open the Stylus "manage" page.
 3. On the sidebar panel, click the **Import** button in the **Backup** section, and select the downloaded file from step 1.
 4. Enjoy!