-
-
Notifications
You must be signed in to change notification settings - Fork 283
DankMaterialShell: init target #1932
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
base: master
Are you sure you want to change the base?
Conversation
This reverts commit 5ab8f90.
trueNAHO
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
- Changes have been tested in testbeds
Would be great to have a testbed for this.
modules/dankMaterialShell/hm.nix
Outdated
| ( | ||
| { colors }: | ||
| let | ||
| colorTheme = { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why are the dark and light themes so different?
modules/dankMaterialShell/hm.nix
Outdated
| in | ||
| { | ||
| home.file.".config/DankMaterialShell/stylix-colors.json".text = | ||
| builtins.toJSON colorTheme; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might be better to inline this single-use variable.
modules/dankMaterialShell/meta.nix
Outdated
| name = "dankMaterialShell"; | ||
| homepage = "https://github.com/AvengeMedia/DankMaterialShell"; | ||
| maintainers = [ lib.maintainers.khas-amir ]; | ||
| description = ''In the settings, click Theme & Colors, then Custom, and select the path to the Stylix-generated color scheme ` ~/.config/DankMaterialShell/stylix-colors.json`''; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This should be properly wrapped:
| description = ''In the settings, click Theme & Colors, then Custom, and select the path to the Stylix-generated color scheme ` ~/.config/DankMaterialShell/stylix-colors.json`''; | |
| description = '' | |
| In the settings, click Theme & Colors, then Custom, and select the path to | |
| the Stylix-generated color scheme | |
| `~/.config/DankMaterialShell/stylix-colors.json`. | |
| ''; |
modules/dankMaterialShell/meta.nix
Outdated
| name = "dankMaterialShell"; | ||
| homepage = "https://github.com/AvengeMedia/DankMaterialShell"; | ||
| maintainers = [ lib.maintainers.khas-amir ]; | ||
| description = ''In the settings, click Theme & Colors, then Custom, and select the path to the Stylix-generated color scheme ` ~/.config/DankMaterialShell/stylix-colors.json`''; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What about automatically applying this? If this actually requires imperatively overriding configuration files, then we can use a similar approach to #951 (comment).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
there is a settings file that stylix could modify, but it's only read on the shell starting up. maybe it could kill and restart the shell when it applies the theme?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since restarting applications is an implicitly expected requirement, we can remove the following description:
| description = "Restart the panel to apply the theme"; |
modules/dankMaterialShell/meta.nix
Outdated
| @@ -0,0 +1,7 @@ | |||
| { lib, ... }: | |||
| { | |||
| name = "dankMaterialShell"; | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should it not be:
| name = "dankMaterialShell"; | |
| name = "DankMaterialShell"; |
Co-authored-by: awwpotato <[email protected]>
|
I don't understand why the checks are failing. |
trueNAHO
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't understand why the checks are failing.
The locally working evaluations are failing in CI for some reason:
2025-11-04T14:39:20.6152550Z building '/nix/store/r3va1pk1gc1wnmn4ajr8f3vbqicxyx8r-dgop-0.1.7.drv'... 2025-11-04T14:39:20.8373284Z error: Nix daemon disconnected unexpectedly (maybe it crashed?) 2025-11-04T14:39:20.8490390Z WARNING:nix_fast_build:build testbed:dankMaterialShell:light exited with 1 [...] 2025-11-04T14:39:46.9992225Z error: Nix daemon disconnected unexpectedly (maybe it crashed?) 2025-11-04T14:39:47.0068660Z WARNING:nix_fast_build:build testbed:dankMaterialShell:dark exited with 1-- https://github.com/nix-community/stylix/actions/runs/18920823815/job/54477479189?pr=1932
CI is using Nix 2.32.1 and does not seem to run out of space:
2025-11-04T15:01:53.3287684Z Filesystem Size Used Avail Use% Mounted on 2025-11-04T15:01:53.3288211Z /dev/root 72G 51G 22G 71% /-- https://github.com/nix-community/stylix/actions/runs/18920823815/job/54477479189?pr=1932
Let's hope rerunning CI several times magically fixes the problem.
@khas-amir, please address and potentially resolve previous change requests.
modules/dankMaterialShell/meta.nix
Outdated
| name = "DankMaterialShell"; | ||
| homepage = "https://github.com/AvengeMedia/DankMaterialShell"; | ||
| maintainers = [ lib.maintainers.khas-amir ]; | ||
| description = "Restart the panel to apply the theme"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you rephrase the description with the IMPORTANT admonition to match the current style:
$ rg --files-with-matches '> \[!IMPORTANT\]'
doc/src/modules.md
modules/blender/meta.nix
modules/discord/meta.nix
modules/firefox/meta.nix
modules/i3/meta.nix
modules/neovim/meta.nix
modules/spicetify/meta.nix
modules/sway/meta.nix
modules/zen-browser/meta.nix
modules/dankMaterialShell/meta.nix
Outdated
| name = "dankMaterialShell"; | ||
| homepage = "https://github.com/AvengeMedia/DankMaterialShell"; | ||
| maintainers = [ lib.maintainers.khas-amir ]; | ||
| description = ''In the settings, click Theme & Colors, then Custom, and select the path to the Stylix-generated color scheme ` ~/.config/DankMaterialShell/stylix-colors.json`''; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since restarting applications is an implicitly expected requirement, we can remove the following description:
| description = "Restart the panel to apply the theme"; |
| in | ||
| { | ||
| home.file.${stylixThemePath}.text = builtins.toJSON colorTheme; | ||
| programs.dankMaterialShell.default.settings = { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Subjective nitpick:
| programs.dankMaterialShell.default.settings = { | |
| programs.dankMaterialShell.default.settings = { |
Maybe rebasing this PR on top of #1961 once its CI passes, also resolves this CI failure. |
|
pulling from master again should fix the ci |
stylix/testbed/default.nix
Outdated
| inputs.zen-browser.homeModules.default | ||
| ]; | ||
|
|
||
| dankMaterialShell.home-manager.sharedModules = [ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
consider sorting this attrset, so darkMaterialShell would be first (note we can't use keep-sorted here due to it not working properly with inherit)
#1924