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

tokyonight-gtk-theme: unstable-2023-05-31 -> 0-unstable-2024-06-27 #323506

Merged
merged 1 commit into from
Jul 9, 2024

Conversation

D3vil0p3r
Copy link
Member

Description of changes

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.

@D3vil0p3r D3vil0p3r added the backport release-24.05 Backport PR automatically label Jun 30, 2024
@D3vil0p3r
Copy link
Member Author

I would like to use -l on install.sh but it works on HOME folder, so it is not possible to work on libadwaita linking.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jun 30, 2024
@nixos-discourse
Copy link

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

https://discourse.nixos.org/t/prs-ready-for-review/3032/4207

@SuperSandro2000 SuperSandro2000 merged commit e3e90f7 into NixOS:master Jul 9, 2024
34 checks passed
Copy link
Contributor

github-actions bot commented Jul 9, 2024

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-323506-to-release-24.05 origin/release-24.05
cd .worktree/backport-323506-to-release-24.05
git switch --create backport-323506-to-release-24.05
git cherry-pick -x 5be87108880900c85f3ce454ea5ebb40c4fcc1f7

@D3vil0p3r D3vil0p3r deleted the patch-5 branch July 9, 2024 17:39
@D3vil0p3r
Copy link
Member Author

Backport failed for release-24.05, because it was unable to cherry-pick the commit(s).

Please cherry-pick the changes locally and resolve any conflicts.

git fetch origin release-24.05
git worktree add -d .worktree/backport-323506-to-release-24.05 origin/release-24.05
cd .worktree/backport-323506-to-release-24.05
git switch --create backport-323506-to-release-24.05
git cherry-pick -x 5be87108880900c85f3ce454ea5ebb40c4fcc1f7

@kirillrdy when you have free time, can you give a look to it?

@fpletz
Copy link
Member

fpletz commented Jul 10, 2024

This PR removed the multiple outputs split packages version of the package and doesn't install the icons at all. 😿

@fpletz fpletz removed the backport release-24.05 Backport PR automatically label Jul 10, 2024
@SoraTenshi
Copy link

It looks like this PR also ignored the "storm" variant?
At least the theme is now broken on my flake, using the package themechange for gtk it also revealed this exact issue.

@D3vil0p3r
Copy link
Member Author

It looks like this PR also ignored the "storm" variant? At least the theme is now broken on my flake, using the package themechange for gtk it also revealed this exact issue.

It was not a color variant. By the last version, the source project changed by introducing a script to generate other different tweaks. Look the helper:

-d, --dest DIR          Specify destination directory (Default: ~/.themes)
-n, --name NAME         Specify theme name (Default: Tokyonight)
-t, --theme VARIANT...  Specify theme color variant(s) [default|purple|pink|red|orange|yellow|green|teal|grey|all] (Default: blue)
-c, --color VARIANT...  Specify color variant(s) [light|dark] (Default: All variants)
-s, --size VARIANT...   Specify size variant [standard|compact] (Default: standard variant)

-l, --libadwaita        Link installed gtk-4.0 theme to config folder for all libadwaita app use this theme

-r, --remove,
-u, --uninstall         Uninstall/Remove installed themes or links

--tweaks                Specify versions for tweaks
                        1. [moon|storm]        Moon|Storm| ColorSchemes version
                        2. black               Blackness color version
                        3. float               Floating gnome-shell panel style
                        4. outline             Windows with 2px outline style

-h, --help              Show help

storm must be retrieved by tweaks. If you agree, we can introduce a new variable in the .nix file and consider also tweaks, themes and size.

@SoraTenshi
Copy link

It looks like this PR also ignored the "storm" variant? At least the theme is now broken on my flake, using the package themechange for gtk it also revealed this exact issue.

It was not a color variant. By the last version, the source project changed by introducing a script to generate other different tweaks. Look the helper:

-d, --dest DIR          Specify destination directory (Default: ~/.themes)
-n, --name NAME         Specify theme name (Default: Tokyonight)
-t, --theme VARIANT...  Specify theme color variant(s) [default|purple|pink|red|orange|yellow|green|teal|grey|all] (Default: blue)
-c, --color VARIANT...  Specify color variant(s) [light|dark] (Default: All variants)
-s, --size VARIANT...   Specify size variant [standard|compact] (Default: standard variant)

-l, --libadwaita        Link installed gtk-4.0 theme to config folder for all libadwaita app use this theme

-r, --remove,
-u, --uninstall         Uninstall/Remove installed themes or links

--tweaks                Specify versions for tweaks
                        1. [moon|storm]        Moon|Storm| ColorSchemes version
                        2. black               Blackness color version
                        3. float               Floating gnome-shell panel style
                        4. outline             Windows with 2px outline style

-h, --help              Show help

storm must be retrieved by tweaks. If you agree, we can introduce a new variable in the .nix file and consider also tweaks, themes and size.

ah ok i see.
Yeah that'd make sense and i agree. Is it something i could help you with?

@D3vil0p3r
Copy link
Member Author

@SoraTenshi I opened a new PR for it. I tested and it works. Please test it too #326675

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
8.has: clean-up 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants