Compare commits

..

3 Commits

3 changed files with 9 additions and 10 deletions

View File

@@ -3,7 +3,7 @@
inputs =
{
self.submodules = true;
self = { submodules = true; lfs = true; };
nixpkgs.url = ./nixpkgs;
nixpkgs-2505.url = "github:CHN-beta/nixpkgs/nixos-25.05";
nixpkgs-2411.url = "github:CHN-beta/nixpkgs/nixos-24.11";

View File

@@ -4,7 +4,6 @@ inputs:
{
type = types.nullOr (types.submodule { options =
{
timeout = mkOption { type = types.int; default = 15; };
windowsEntries = mkOption { type = types.attrsOf types.nonEmptyStr; default = {}; };
# "efi" using efi, "efiRemovable" using efi with install grub removable, or dev path like "/dev/sda" using bios
installDevice = mkOption { type = types.str; default = "efi"; };
@@ -15,9 +14,13 @@ inputs:
(inputs.lib.mkMerge
[
# general settings
{ boot.loader.grub = { enable = true; useOSProber = false; }; }
# grub timeout
{ boot.loader.timeout = grub.timeout; }
{
boot.loader =
{
grub = { enable = true; useOSProber = false; };
timeout = if inputs.config.nixos.model.type == "desktop" then null else 15;
};
}
# grub install
{
boot.loader =

View File

@@ -3,11 +3,7 @@ inputs:
config =
{
# only preserve the last 7 days of logs
services =
{
journald.extraConfig = "MaxRetentionSec=7d";
logind.settings.Login.HandleLidSwitch = "ignore";
};
services.journald.extraConfig = "MaxRetentionSec=7d";
systemd =
{
settings.Manager =