Skip to content

Conversation

mushrowan
Copy link
Contributor

Description of changes

qogir-cursors-recolored: init at 2023-10-03
https://github.com/TeddyBearKilla/Qogir-Cursors-Recolored
I basically copied #284617 with a couple of tweaks related to capitalisation to make it work.

My first PR so please let me know if I've messed up :)

Things done

  • Built on platform:
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • Tested, as applicable:
  • Ran nixpkgs-review on this PR. See nixpkgs-review usage.
  • Tested basic functionality of all binary files, usually in ./result/bin/.
  • Nixpkgs Release Notes
    • Package update: when the change is major or breaking.
  • NixOS Release Notes
    • Module addition: when adding a new NixOS module.
    • Module update: when the change is significant.
  • Fits CONTRIBUTING.md, pkgs/README.md, maintainers/README.md and other READMEs.

Add a 👍 reaction to pull requests you find important.

@nixpkgs-ci nixpkgs-ci bot added 12.first-time contribution This PR is the author's first one; please be gentle! 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 9.needs: reviewer This PR currently has no reviewers requested and needs attention. labels Aug 9, 2025
Copy link
Contributor

@SigmaSquadron SigmaSquadron left a comment

Choose a reason for hiding this comment

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

Welcome to Nixpkgs! Thanks for packaging this software.

Please review our Commit Conventions and reword your commits appropriately; their titles must follow very specific patterns as defined in our documentation. Don't forget to squash your intermediate/fixup commits.

I've left some additional review comments below.

@@ -17344,6 +17344,12 @@
githubId = 96225281;
name = "Mustafa Çalışkan";
};
mushrowan = {
email = "roarch@proton.me";
name = "rowan amber-jones";
Copy link
Contributor

Choose a reason for hiding this comment

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

This isn't required, but are you sure you don't want to capitalise your name?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i was going by how i have it in my git config - do you think it'd be better to capitalise it?

Copy link
Contributor

Choose a reason for hiding this comment

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

nah, if you prefer lowercase, let it be

Comment on lines 71 to 87
lib.checkListOfEnum "${pname}: theme variants" availableThemeVariants themeVariants
lib.checkListOfEnum
"${pname}: catppuccin color variants"
availableColorVariants.Catppuccin
catppuccinColorVariants
lib.checkListOfEnum
"${pname}: dracula color variants"
availableColorVariants.Dracula
draculaColorVariants
lib.checkListOfEnum
"${pname}: gruvbox color variants"
availableColorVariants.Gruvbox
gruvboxColorVariants
lib.checkListOfEnum
"${pname}: original color variants"
availableColorVariants.Original
originalColorVariants
Copy link
Contributor

Choose a reason for hiding this comment

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

Perhaps there's a neater way to check these? lib.asserts.* should have a function that won't require 16 lines of input checks.

Copy link
Contributor Author

@mushrowan mushrowan Aug 9, 2025

Choose a reason for hiding this comment

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

To be honest I didnt really know what this bit was for - the vast majority of this whole PR is just an adaptation of https://github.com/TeddyBearKilla/Qogir-Cursors-Recolored. What were you thinking for how to fix this? lib.asserts.assertEachOneOf seems to do basically the same thing with the ordering of inputs slightly different (unless i'm misunderstanding) so it seems like it would be just the same length.

I thought of doing some function where we zip the *variants and available*variants lists into some list of lists (or attrsets containing both) and then mapping the check over that list which contains them, kinda pseudo map variant: (eachOneOf variant.inputVariants variant.availableVariants) [<list of attrsets containing inputvariants and availablevariants goes here...>] - but this feels like overengineering it a little, maybe i'm wrong?

runHook postInstall
'';

meta = with lib; {
Copy link
Contributor

@SigmaSquadron SigmaSquadron Aug 9, 2025

Choose a reason for hiding this comment

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

Suggested change
meta = with lib; {
meta = {

Nit: Avoid wide with scopes in attribute sets. It's alright to repeat lib.* when you need it:

{
  meta = {
    license = lib.licenses.publicDomain;
    maintainers = with lib.maintainers; [ maintainer ];
  };
}

@nixpkgs-ci nixpkgs-ci bot removed the 9.needs: reviewer This PR currently has no reviewers requested and needs attention. label Aug 9, 2025
@acid-bong
Copy link
Contributor

Another thang about commits: do not merge inside a PR branch, it must remain linear. Just rebase the branch on a fresher master commit instead

@mushrowan mushrowan mentioned this pull request Aug 9, 2025
12 tasks
fixup

Co-authored-by: Fernando Rodrigues <alpha@sigmasquadron.net>

fix pname and version
@acid-bong
Copy link
Contributor

you don't have to close the PR to edit the branch, just force-push the new commits and you're good

@mushrowan
Copy link
Contributor Author

you don't have to close the PR to edit the branch, just force-push the new commits and you're good

currently wrestling with git issues, i think it auto closed because i did something stupid (only did a shallow clone because working with full nixpkgs history makes my pc scream, but now it's complaining about merge conflicts)

i'll fix and reopen when i can lol

@acid-bong
Copy link
Contributor

Instead of closing, consider marking the PR as draft (the button is in the right sidebar on desktop or below the comment field on mobile)

@mushrowan
Copy link
Contributor Author

okay, i think the git history from what i was doing before is just fundamentally broken somehow, and maybe someone smarter than me would know how to fix it but i've bashed my head against it for hours now and honestly getting pretty annoyed at myself. if i rebase and force push, it wont let me reopen because apparently you cant reopen force pushed branch commits. but if i git reset to the commit from the PR and force push, i cant reopen as there's no shared history between my branch and nixpkgs master.

might just leave this for now and make a new PR at some point

@mushrowan
Copy link
Contributor Author

#432364 remade it here. sorry for the timewaste

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 12.first-time contribution This PR is the author's first one; please be gentle!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants