Skip to content

sddm-tokyo-night: init at 0-unstable-2023-06-13#404816

Open
tohmais wants to merge 2 commits intoNixOS:masterfrom
tohmais:sddm-tokyo-night-init1
Open

sddm-tokyo-night: init at 0-unstable-2023-06-13#404816
tohmais wants to merge 2 commits intoNixOS:masterfrom
tohmais:sddm-tokyo-night-init1

Conversation

@tohmais
Copy link
Copy Markdown

@tohmais tohmais commented May 7, 2025

Added the SDDM theme, tokyo-night-sddm, which is based on sugar dark. Edited the name slightly to be more consistent with other SDDM theme packages.

First time contributor, so please tell me if I screwed something up! Made a new PR because the original didn't follow commit guidelines.

I found using some of the other SDDM theme packages frustrating, so I'm using propagatedUserEnvPkgs instead of propagatedBuildInputs or similar. That means you install the theme by:

services.displayManager.sddm = {
  enable = true;  
  theme = "tokyo-night";
};

environment.systemPackages = [ pkgs.sddm-tokyo-night];

Instead of having to add the package to both environment.systemPackages and services.displayManager.sddm.extraPackages.

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.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.

@github-actions github-actions Bot added the 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` label May 7, 2025
@tohmais
Copy link
Copy Markdown
Author

tohmais commented May 7, 2025

Ended up having to add another commit anyways. No idea how rebasing works, but I hope it's ok.

@github-actions github-actions Bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels May 7, 2025
@nixpkgs-ci nixpkgs-ci Bot added the 12.first-time contribution This PR is the author's first one; please be gentle! label Jun 25, 2025
@nixpkgs-ci nixpkgs-ci Bot added the 9.needs: reviewer This PR currently has no reviewers requested and needs attention. label Jul 4, 2025
Comment thread pkgs/data/themes/sddm-tokyo-night/default.nix Outdated
@nixpkgs-ci nixpkgs-ci Bot removed the 9.needs: reviewer This PR currently has no reviewers requested and needs attention. label Jul 31, 2025
@iamanaws
Copy link
Copy Markdown
Member

iamanaws commented Jul 31, 2025

Ended up having to add another commit anyways. No idea how rebasing works, but I hope it's ok.

You’ll need to rebase your commits, but don’t worry—I can guide you through it!

First steps:

  1. Please make the requested changes in your code.
  2. You can either create a new commit for these changes or amend your previous commit using git commit --amend. Since we’ll be rebasing next, either approach is fine.

Rebasing Goals

  1. The maintainers: add tohmais commit should come before the package initialization commit.
  2. All package initialization commits should be squashed (combined) into a single commit.

How to Rebase

We can do this in one go with an interactive rebase:

git rebase -i HEAD~4

This will open your configured editor with a list of the last 4 commits.

In the editor:

  1. Move the line for the maintainers: add tohmais commit so it comes before the package init commits.
  2. Leave the first pick for the maintainer commit and the first package init commit.
  3. For the remaining package init commits, change pick to fixup (or just f). This will squash them into the first package init commit.
  4. Save and close the editor.

After the rebase, you’ll need to force-push your branch:

git push --force

If you run into any issues or have questions during the process, let me know and I’ll be happy to help!

@tohmais tohmais force-pushed the sddm-tokyo-night-init1 branch from 65f77ef to 406a150 Compare July 31, 2025 07:10
@tohmais
Copy link
Copy Markdown
Author

tohmais commented Jul 31, 2025

Committed the requested changes, and rebased. Thanks for such comprehensive instructions!

@tohmais tohmais force-pushed the sddm-tokyo-night-init1 branch from 406a150 to d49029a Compare July 31, 2025 07:34
@tohmais
Copy link
Copy Markdown
Author

tohmais commented Jul 31, 2025

Fixed a missing semi-colon in the licences array. Should be good to merge now.

@tohmais tohmais force-pushed the sddm-tokyo-night-init1 branch from d49029a to 16859b9 Compare July 31, 2025 11:46
@tohmais
Copy link
Copy Markdown
Author

tohmais commented Jul 31, 2025

Needed to format with the new official formatter. It should finally be good to merge.

@iamanaws
Copy link
Copy Markdown
Member

nixpkgs-review result

Generated using nixpkgs-review-gha

Command: nixpkgs-review pr 404816

Logs: https://github.com/Iamanaws/nixpkgs-review-gha/actions/runs/16650202306


x86_64-linux

✅ 1 package built:
  • sddm-tokyo-night

aarch64-linux

✅ 1 package built:
  • sddm-tokyo-night

@nixpkgs-ci nixpkgs-ci Bot added the 12.approvals: 1 This PR was reviewed and approved by one person. label Jul 31, 2025
@nixpkgs-ci nixpkgs-ci Bot added the 2.status: merge conflict This PR has merge conflicts with the target branch label Oct 11, 2025
@nixpkgs-ci nixpkgs-ci Bot added the 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md label Jan 29, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2.status: merge conflict This PR has merge conflicts with the target branch 2.status: stale https://github.com/NixOS/nixpkgs/blob/master/.github/STALE-BOT.md 8.has: maintainer-list (update) This PR changes `maintainers/maintainer-list.nix` 10.rebuild-darwin: 0 This PR does not cause any packages 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.approvals: 1 This PR was reviewed and approved by one person. 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.

2 participants