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

catppuccin-gtk: fix inconsistent theme name #324265

Merged
merged 1 commit into from
Jul 3, 2024

Conversation

eljamm
Copy link
Contributor

@eljamm eljamm commented Jul 3, 2024

Description of changes

The theme name uses default as fallback for tweaks when they aren't set, which not only is not a valid tweak name, but can lead to confusion and inconsistencies.

As such, we can either replace "default" with "normal", or we can just remove tweaks from the theme name if the list is empty.
The advantage of the second approach is that users won't have to worry about which tweak name they have to specify by default, which also looks cleaner:

    # before
    gtk.theme.name = "catppuccin-macchiato-pink-compact+default";

    # after
    gtk.theme.name = "catppuccin-macchiato-pink-compact";

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@eljamm eljamm requested review from fufexan, dixslyf and isabelroses July 3, 2024 09:03
Copy link
Member

@isabelroses isabelroses left a comment

Choose a reason for hiding this comment

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

This seems reasonable but my only issue is that now we are deferring from upstream which also adds to the confusion. I mean even I got confused by this, and I've done some work on ctp gtk

@eljamm
Copy link
Contributor Author

eljamm commented Jul 3, 2024

We can't really do much there since upstream was archived, but it doesn't make sense to leave it as it is now either as default is not a valid tweak.

Copy link
Member

@isabelroses isabelroses left a comment

Choose a reason for hiding this comment

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

Sounds good, added backport to make catppuccin/nix's life a bit easier

@isabelroses isabelroses added 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Jul 3, 2024
@Aleksanaa Aleksanaa merged commit 5dc360e into NixOS:master Jul 3, 2024
32 of 33 checks passed
Copy link
Contributor

github-actions bot commented Jul 3, 2024

Successfully created backport PR for release-24.05:

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/gtk-settings-suddenly-not-applying/47381/13

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants