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(nixos/sddm): use the kde sddm package #230

Merged
merged 2 commits into from
Jun 22, 2024
Merged

Conversation

isabelroses
Copy link
Member

@isabelroses isabelroses commented Jun 14, 2024

This resolves the error where the theme doesn't work if plasma6 isn't enabled. by default the packge is qt5 sddm, but catppuccin/sddm uses qt6.

@isabelroses
Copy link
Member Author

closes #229

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.

i think this would be better as an assertion...but i'm not really sure how to reliably do that as sddm doesn't directly report its qt's major version

my first thoughts are asserting that pkgs.kdePackages.qtbase is in the buildInputs of config.services.displayManager.sddm.package or making a conditionally applied assertion for services.displayManager.sddm.package via a new option

@isabelroses
Copy link
Member Author

I think the easiest thing would be to check what package is being used since it's either the qt5 one or the kde package.

@isabelroses
Copy link
Member Author

or perhaps lib.mkDefault would be better so we don't get clashes with users that apply the plasma 6 desktop.

@getchoo
Copy link
Member

getchoo commented Jun 15, 2024

I think the easiest thing would be to check what package is being used since it's either the qt5 one or the kde package.

that's what i meant with a conditional assertion. it wouldn't account for overriden packages ofc, but if someone really knows what they're doing they can disable it with an option

or perhaps lib.mkDefault would be better

i don't think it would as users could easily set the qt5 package as normal with no warning. assertions on the other hand provide a built in explanation of why we need to use the qt6 version when this happens

so we don't get clashes with users that apply the plasma 6 desktop

why would this happen?

@isabelroses
Copy link
Member Author

why would this happen?

The duplicate package deceleration I mean.

modules/nixos/sddm.nix Outdated Show resolved Hide resolved
@getchoo getchoo added this to the 1.0.0 milestone Jun 22, 2024
the upstream port has moved to qt 6, while nixos' default is still qt 5
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 b6c8545 into catppuccin:main Jun 22, 2024
6 checks passed
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.

2 participants