tweaked bootloader in core/display.nix

This commit is contained in:
serenity-F 2025-02-13 00:28:34 +10:00
parent e295f0b5ef
commit 6ef18fbd4b
2 changed files with 19 additions and 4 deletions

View file

@ -1,7 +1,14 @@
{ pkgs, ... }: { pkgs, label, version, ... }:
{ {
system = {
nixos = {
label = "${version}";
variantName = "${label}";
};
};
boot = { boot = {
bootspec.enable = true; bootspec.enable = true;
consoleLogLevel = 0; consoleLogLevel = 0;
@ -21,13 +28,15 @@
loader = { loader = {
timeout = 5; timeout = 5;
grub = { grub = {
configurationName = "${version}";
#theme = "${pkgs.minimal-grub-theme}"; #theme = "${pkgs.minimal-grub-theme}";
#backgroundColor = "#000000"; #backgroundColor = "#000000";
#font = "${pkgs.spleen}/share/fonts/spleen-32x64"; #font = "${pkgs.spleen}/share/fonts/spleen-32x64";
#fontSize = 16; #fontSize = 16;
splashImage = null; splashImage = null;
timeoutStyle = "hidden";
extraConfig = '' extraConfig = ''
set timeout_style=hidden GRUB_FORCE_HIDDEN_MENU=true
''; '';
}; };
}; };

View file

@ -41,7 +41,7 @@
# #
# #
{ {
description = "SerenityOS v0.8.8"; # proper versioning system before v1.0.0? description = "SerenityOS v0.8.9";
## Latest features: ## Latest features:
## - Exposed large portions of `home/` import path ## - Exposed large portions of `home/` import path
## - Abandoned multi-user support for now ## - Abandoned multi-user support for now
@ -125,8 +125,10 @@
inherit (self) outputs; inherit (self) outputs;
## Universal variable declarations ## Universal variable declarations
label = "SerenityOS";
version = "SerenityOS v0.8.9"; # proper versioning system before v1.0.0?
primaryUser = "serenity"; # used for admin purposes primaryUser = "serenity"; # used for admin purposes
homeDir = "/home/${primaryUser}"; # for easy configuration homeDir = "/home/${primaryUser}/"; # for easy configuration
disksPath = "${homeDir}/Disks/"; disksPath = "${homeDir}/Disks/";
flakePath = "${homeDir}/flakes/nixdots/"; # current path to flake flakePath = "${homeDir}/flakes/nixdots/"; # current path to flake
#flakePath = "${homeDir}/SerenityOS/"; # for v1.0.0 release #flakePath = "${homeDir}/SerenityOS/"; # for v1.0.0 release
@ -140,6 +142,7 @@
format = "install-iso"; format = "install-iso";
specialArgs = { specialArgs = {
inherit inputs outputs; inherit inputs outputs;
inherit label version;
inherit flakePath disksPath; inherit flakePath disksPath;
inherit primaryUser homeDir; inherit primaryUser homeDir;
}; };
@ -159,6 +162,7 @@
hades = nixpkgs.lib.nixosSystem { hades = nixpkgs.lib.nixosSystem {
specialArgs = { specialArgs = {
inherit inputs outputs; inherit inputs outputs;
inherit label version;
inherit flakePath disksPath; inherit flakePath disksPath;
inherit primaryUser homeDir; inherit primaryUser homeDir;
}; };
@ -174,6 +178,7 @@
orcus = nixpkgs.lib.nixosSystem { orcus = nixpkgs.lib.nixosSystem {
specialArgs = { specialArgs = {
inherit inputs outputs; inherit inputs outputs;
inherit label version;
inherit flakePath disksPath; inherit flakePath disksPath;
inherit primaryUser homeDir; inherit primaryUser homeDir;
}; };
@ -188,6 +193,7 @@
persephone = nixpkgs.lib.nixosSystem { persephone = nixpkgs.lib.nixosSystem {
specialArgs = { specialArgs = {
inherit inputs outputs; inherit inputs outputs;
inherit label version;
inherit flakePath disksPath; inherit flakePath disksPath;
inherit primaryUser homeDir; inherit primaryUser homeDir;
}; };