grub: migrate to mkTarget#2357
Draft
0xda157 wants to merge 1 commit into
Draft
Conversation
0xda157
commented
Jun 5, 2026
0xda157
commented
Contributor
- I certify that I have the right to submit this contribution under the MIT license
- Commit messages adhere to Stylix commit conventions
- Theming changes adhere to the Stylix style guide
- Changes have been tested locally
- Changes have been tested in testbeds
- Each commit in this PR is suitable for backport
stylix-automation
Bot
added
topic: nixos
Contributor
Author
|
(marking as draft until I can test locally) |
trueNAHO
requested changes
Jun 6, 2026
Comment on lines
+200
to
+201
| stylix.targets.grub.theme = { | ||
| main = '' |
Member
There was a problem hiding this comment.
Nitpick:
Suggested change
| stylix.targets.grub.theme = { | |
| main = '' | |
| stylix.targets.grub.theme.main = '' |
Comment on lines
+200
to
+204
| stylix.targets.grub.theme = { | ||
| main = '' | ||
| desktop-color: "${colors.withHashtag.base00}" | ||
| ''; | ||
| }; |
Member
There was a problem hiding this comment.
If the surrounding newlines are optional, this could be simplified as something like:
Suggested change
| stylix.targets.grub.theme = { | |
| main = '' | |
| desktop-color: "${colors.withHashtag.base00}" | |
| ''; | |
| }; | |
| stylix.targets.grub.theme.main = | |
| ''desktop-color: "${colors.withHashtag.base00}"''; |
| { | ||
| mkTarget { | ||
| options = { | ||
| useWallpaper = mkEnableWallpaper "GRUB" false; |
Member
There was a problem hiding this comment.
Comment on lines
+175
to
176
|
|
||
|
|
Member
There was a problem hiding this comment.
Remove the noisy empty lines:
diff --git a/modules/grub/nixos.nix b/modules/grub/nixos.nix
index 93195cd7..7cd1d2e7 100644
--- a/modules/grub/nixos.nix
+++ b/modules/grub/nixos.nix
@@ -172,8 +172,6 @@ mkTarget {
desktop-image-scale-method: "${image-scale}"
'';
extraBuildScript = ''
-
-
${
if
cfg.useWallpaper| # This font will be used for the GRUB terminal | ||
| font = toString (mkGrubFont fonts.monospace); | ||
|
|
||
| # TODO: Include OS icons |
Member
There was a problem hiding this comment.
This vanished comment should probably be brought back.
| || cfg.theme.boot_menu != "" | ||
| ) | ||
| { | ||
|
|
Member
There was a problem hiding this comment.
diff --git a/modules/grub/nixos.nix b/modules/grub/nixos.nix
index 93195cd7..65a1cf79 100644
--- a/modules/grub/nixos.nix
+++ b/modules/grub/nixos.nix
@@ -63,7 +63,6 @@ mkTarget {
|| cfg.theme.boot_menu != ""
)
{
-
theme =
pkgs.runCommand "stylix-grub"
{
Comment on lines
+59
to
+64
| lib.mkIf | ||
| ( | ||
| cfg.theme.main != "" | ||
| || cfg.theme.progress_bar != "" | ||
| || cfg.theme.boot_menu != "" | ||
| ) |
Member
There was a problem hiding this comment.
Should we not move this lib.mkIf into the single theme declaration:
theme =
lib.mkIf
(
/* ... */
)
(
pkgs.runCommand "stylix-grub"
{
/* ... */
}
(
/* ... */
)
);
Comment on lines
+61
to
+63
| cfg.theme.main != "" | ||
| || cfg.theme.progress_bar != "" | ||
| || cfg.theme.boot_menu != "" |
Member
There was a problem hiding this comment.
If the purpose of this clever condition is to only declare the otherwise unconditional Stylix theme when something of value happens, should it not guard on everything, including cfg.theme.extraBuildScript:
Suggested change
| cfg.theme.main != "" | |
| || cfg.theme.progress_bar != "" | |
| || cfg.theme.boot_menu != "" | |
| cfg.theme.main != "" | |
| || cfg.theme.progress_bar != "" | |
| || cfg.theme.boot_menu != "" | |
| || cfg.theme.extraBuildScript != "" |
| pkgs.runCommand "stylix-grub" | ||
| { | ||
| passAsFile = [ "themeTxt" ]; | ||
| themeTxt = '' |
Member
There was a problem hiding this comment.
IMHO, this looks better without explicitly concatenating strings:
diff --git a/modules/grub/nixos.nix b/modules/grub/nixos.nix
index 93195cd7..a32c783c 100644
--- a/modules/grub/nixos.nix
+++ b/modules/grub/nixos.nix
@@ -77,36 +77,38 @@ mkTarget {
terminal-height: "60%"
${cfg.theme.main}
- ''
- + lib.optionalString (cfg.theme.progress_bar != "") ''
- + progress_bar {
- left = 25%
- top = 80%+20 # 20 pixels below boot menu
- width = 50%
- height = 30
- id = "__timeout__"
- show_text = true
- text = "@TIMEOUT_NOTIFICATION_MIDDLE@"
- ${cfg.theme.progress_bar}
- }
- ''
- + lib.optionalString (cfg.theme.boot_menu != "") ''
- + boot_menu {
- left = 25%
- top = 20%
- width = 50%
- height = 60%
- menu_pixmap_style = "background_*.png"
+ ${lib.optionalString (cfg.theme.progress_bar != "") ''
+ + progress_bar {
+ left = 25%
+ top = 80%+20 # 20 pixels below boot menu
+ width = 50%
+ height = 30
+
+ id = "__timeout__"
+ show_text = true
+ text = "@TIMEOUT_NOTIFICATION_MIDDLE@"
+ ${cfg.theme.progress_bar}
+ }
+ ''}
+
+ ${lib.optionalString (cfg.theme.boot_menu != "") ''
+ + boot_menu {
+ left = 25%
+ top = 20%
+ width = 50%
+ height = 60%
+ menu_pixmap_style = "background_*.png"
- item_height = 40
- item_icon_space = 8
- item_spacing = 0
- item_padding = 0
+ item_height = 40
+ item_icon_space = 8
+ item_spacing = 0
+ item_padding = 0
- selected_item_pixmap_style = "selection_*.png"
- ${cfg.theme.boot_menu}
- }
+ selected_item_pixmap_style = "selection_*.png"
+ ${cfg.theme.boot_menu}
+ }
+ ''}
'';
}
(
Comment on lines
+112
to
+118
| ( | ||
| '' | ||
| mkdir $out | ||
| cp $themeTxtPath $out/theme.txt | ||
| '' | ||
| + cfg.theme.extraBuildScript | ||
| ); |
Member
There was a problem hiding this comment.
IMHO, this looks better without explicitly concatenating strings:
diff --git a/modules/grub/nixos.nix b/modules/grub/nixos.nix
index 93195cd7..d4047b66 100644
--- a/modules/grub/nixos.nix
+++ b/modules/grub/nixos.nix
@@ -109,13 +109,12 @@ mkTarget {
}
'';
}
- (
- ''
- mkdir $out
- cp $themeTxtPath $out/theme.txt
- ''
- + cfg.theme.extraBuildScript
- );
+ ''
+ mkdir $out
+ cp $themeTxtPath $out/theme.txt
+
+ ${cfg.theme.extraBuildScript}
+ '';
}
)
(
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.