From d660c231c280381f3ea589faaeadada8307cab52 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Tue, 8 Jun 2021 20:01:45 +0300 Subject: [PATCH] Move boot loader timeout to boot.nix --- machines/AMD-Workstation/default.nix | 2 -- modules/boot.nix | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/machines/AMD-Workstation/default.nix b/machines/AMD-Workstation/default.nix index 43ca028..5237d3e 100644 --- a/machines/AMD-Workstation/default.nix +++ b/machines/AMD-Workstation/default.nix @@ -22,8 +22,6 @@ services.apcupsd.enable = true; boot.binfmt.emulatedSystems = [ "aarch64-linux" ]; - boot.loader.timeout = 4; # Otherwise it's impossible to change generations - secrets.wireguard-wg0 = { }; persist = { diff --git a/modules/boot.nix b/modules/boot.nix index f112f96..669f785 100644 --- a/modules/boot.nix +++ b/modules/boot.nix @@ -1,7 +1,7 @@ { lib, pkgs, config, ... }: { boot = { loader = { - timeout = lib.mkForce 1; + timeout = lib.mkForce 4; grub.enable = lib.mkForce false; systemd-boot.enable = pkgs.system == "x86_64-linux"; };