mirror of
https://github.com/CHN-beta/nixos.git
synced 2026-01-11 23:09:22 +08:00
Compare commits
3 Commits
0cbeb830b9
...
411a276d34
| Author | SHA1 | Date | |
|---|---|---|---|
| 411a276d34 | |||
| 3b2ed6d850 | |||
| e580d7faa2 |
@@ -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";
|
||||
|
||||
@@ -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 =
|
||||
|
||||
@@ -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 =
|
||||
|
||||
Reference in New Issue
Block a user