Skip to content

Add Catppuccin Mocha theme#165

Merged
matze merged 2 commits intomatze:masterfrom
SchweGELBin:catppuccin
Jun 4, 2025
Merged

Add Catppuccin Mocha theme#165
matze merged 2 commits intomatze:masterfrom
SchweGELBin:catppuccin

Conversation

@SchweGELBin
Copy link
Copy Markdown
Contributor

Hello!

I worked myself down from creating a catppuccin submodule of their bat theme, merging this into bat, adding the catppuccin themes to two-face and now I'm here.

I've added the Catppuccin Mocha theme as "catppuccin".
two-face hasn't made a release since they merged my pr, so I bumped the dependency to their git version.
If you want to wait for the release instead, I can put this into draft until two-face and bat are ready.

Have a great day!

Copy link
Copy Markdown
Owner

@matze matze left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you very much for going the long way and introducing Catppuccin everywhere along the dependency tree. I like the change but would only merge with a release of two-face and light theme being supported.

But again, much appreciated!

Comment thread crates/wastebin_server/src/highlight.rs Outdated
@SchweGELBin
Copy link
Copy Markdown
Contributor Author

Thank you for the fast reply! I'll put this pr into draft until two-face creates a new release.

Have a great day!

@SchweGELBin SchweGELBin marked this pull request as draft June 2, 2025 10:53
@matze
Copy link
Copy Markdown
Owner

matze commented Jun 2, 2025

@CosmicHorrorDev any ETA on a new release?

@SchweGELBin
Copy link
Copy Markdown
Contributor Author

@CosmicHorrorDev any ETA on a new release?

CosmicHorrorDev/two-face#91

I'm not planning on cutting a release for this crate until bat has another release, since that seems like a good cadence to keep. You can always use these changes by pulling them in as a git dependency assuming you don't need to publish things to crates.io since they don't allow git/path dependencies

@CosmicHorrorDev
Copy link
Copy Markdown

Yup yup. And doubly so in this case because adding/removing themes is currently a breaking change with EmbeddedThemeName

@CosmicHorrorDev
Copy link
Copy Markdown

CosmicHorrorDev commented Jun 2, 2025

That being said the breaking changes are already merged, so I could cut a 0.5.0-rc1 release if desired

@matze
Copy link
Copy Markdown
Owner

matze commented Jun 2, 2025

That being said the breaking changes are already merged, so I could cut a 0.5.0-rc1 release if desired

Definitely an option for me. The git dependency right now, is a pain in the ass 😅

@CosmicHorrorDev
Copy link
Copy Markdown

Consider it done after I'm off work o7

@SchweGELBin
Copy link
Copy Markdown
Contributor Author

Thank you both for you work and help!

I can update the Cargo.toml file tomorrow and mark this pr as ready.

Have a great day!

@CosmicHorrorDev
Copy link
Copy Markdown

and 0.5.0-rc1 is now published

@SchweGELBin SchweGELBin marked this pull request as ready for review June 3, 2025 17:53
@SchweGELBin
Copy link
Copy Markdown
Contributor Author

SchweGELBin commented Jun 3, 2025

Hello, I've rebased this pr and it should be ready now.

Have a great day!

@matze
Copy link
Copy Markdown
Owner

matze commented Jun 4, 2025

You might want to format with cargo fmt instead or configure rustfmt differently.

@matze matze merged commit ea0ae72 into matze:master Jun 4, 2025
2 checks passed
@SchweGELBin SchweGELBin deleted the catppuccin branch June 4, 2025 13:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants