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: use vendored colloid-gtk-theme #321293

Merged
merged 1 commit into from
Jun 20, 2024

Conversation

Aleksanaa
Copy link
Member

We used to replace vendored colloid-gtk-theme with our nixpkgs version, but catppuccin-gtk has been archived, and its patches cannot be applied on recent version of colloid-gtk-theme, so we dropped it. We may deprecate catppuccin-gtk in favor of the catppuccin flavor of colloid-gtk-theme (which was introduced in 2024-06-18), but still needs some user feedback.

Description of changes

Fixes #315143 (comment)

Related #320681

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.

We used to replace vendored colloid-gtk-theme with our nixpkgs version,
but catppuccin-gtk has been archived, and its patches cannot be applied
on recent version of colloid-gtk-theme, so we dropped it.
We may deprecate catppuccin-gtk in favor of the catppuccin flavor of
colloid-gtk-theme (which was introduced in 2024-06-18), but still needs
some user feedback.
@Aleksanaa Aleksanaa requested review from isabelroses and fufexan and removed request for isabelroses June 20, 2024 16:30
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.

Seems to fix the issue 👍

@fufexan
Copy link
Contributor

fufexan commented Jun 20, 2024

If we're going through with this PR, after how long do we deprecate it? I assume development will only take place in Colloid from now on.

@Aleksanaa
Copy link
Member Author

If we're going through with this PR, after how long do we deprecate it? I assume development will only take place in Colloid from now on.

Maybe a few months? There is no need to remove this kind of thing immediately, we can wait and see for a while

@khaneliman
Copy link
Contributor

Result of nixpkgs-review pr 321293 run on x86_64-linux 1

1 package built:
  • catppuccin-gtk

Copy link
Contributor

@khaneliman khaneliman left a comment

Choose a reason for hiding this comment

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

image
Fixed the theme being provided from the derivation for me

@khaneliman
Copy link
Contributor

If we're going through with this PR, after how long do we deprecate it? I assume development will only take place in Colloid from now on.

The current derivation doesn't provide any theme output, this is fixing the derivation to actually work again.

@isabelroses
Copy link
Member

isabelroses commented Jun 20, 2024

If we're going through with this PR, after how long do we deprecate it? I assume development will only take place in Colloid from now on.

I'd prefer not to remove it for the foreseeable future since catppuccin/gtk though dead still supports catppuccin better than colloid since it supports the full 4 themes and all accents, as well as an OLED tweak, none of which colloid does.

Though catppuccin-gtk should be removed at some point...

@Kranzes
Copy link
Member

Kranzes commented Jun 20, 2024

Is collooid a proper replacement though? I don't think you can pick a a variant and flavor there, e.g. macchiato + maroon

@ofborg ofborg bot requested review from dixslyf and isabelroses June 20, 2024 17:19
@Aleksanaa Aleksanaa merged commit a8e819d into NixOS:master Jun 20, 2024
29 of 31 checks passed
@nonetrix
Copy link
Contributor

Is collooid a proper replacement though? I don't think you can pick a a variant and flavor there, e.g. macchiato + maroon

Doesn't seem so, only thing I could find is comment in issue asking for Catppuccin in the first place that it wasn't available and asking for it but no issue or anything tracking it directly

@Aleksanaa
Copy link
Member Author

Is collooid a proper replacement though? I don't think you can pick a a variant and flavor there, e.g. macchiato + maroon

Doesn't seem so, only thing I could find is comment in issue asking for Catppuccin in the first place that it wasn't available and asking for it but no issue or anything tracking it directly

It's done, and I've updated colloid

@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/5

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants