Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(home-manager): use correct theme name #239

Merged
merged 1 commit into from
Jun 23, 2024
Merged

Conversation

eljamm
Copy link
Contributor

@eljamm eljamm commented Jun 22, 2024

Summary

The theme name does not correctly match the one from catppuccin-gtk which should be catppuccin-${FLAVOR}-${ACCENT}-${SIZE}+${TWEAKS} as the Usage docs specify.

Changes

  • Name is all lower case now
  • Order changed from flavor-size-accent-gtkTheme to flavor-accent-size+tweaks

variant = cfg.flavor;
};
theme = {
name = "catppuccin-${cfg.flavor}-${cfg.accent}-${cfg.size}+default";
Copy link
Member

Choose a reason for hiding this comment

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

i believe tweaks are added at the end. For example +default for no tweaks, +black for the black tweak.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

So the tweak to path mapping is this?

  • black -> +black
  • rimless -> +rimless
  • normal -> +default

Copy link
Member

Choose a reason for hiding this comment

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

seem correct

@eljamm
Copy link
Contributor Author

eljamm commented Jun 22, 2024

If I didn't mess up, [ "normal" "black" "rimless" ] should become "default+black+rimless" with this change.

@eljamm eljamm force-pushed the gtk branch 2 times, most recently from 97c9bd6 to 6ce6da4 Compare June 22, 2024 12:36
@eljamm
Copy link
Contributor Author

eljamm commented Jun 22, 2024

Well, turns out I did mess up, but it should work now.

- Theme name is all lowercase now
- Change order from `flavor-size-accent-gtkTheme` to
`flavor-accent-size+gtkTweaks`
@eljamm
Copy link
Contributor Author

eljamm commented Jun 22, 2024

So apparently it's just enough to append the tweaks at the end. In the derivation result, the names were being seperated by , and not + so I changed that as well.

Screenshot from 2024-06-22 15-27-32

I tested this on my machine and everything works great.

Copy link
Member

@getchoo getchoo left a comment

Choose a reason for hiding this comment

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

thanks!

@getchoo getchoo merged commit 2fb16f2 into catppuccin:main Jun 23, 2024
6 checks passed
@eljamm eljamm deleted the gtk branch June 23, 2024 07:37
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