diff options
| author | Alan Pearce | 2020-09-21 14:46:24 +0200 |
|---|---|---|
| committer | Alan Pearce | 2020-09-21 14:46:53 +0200 |
| commit | 43af8a15b95702fe27e79c1eac85a77de5a29474 (patch) | |
| tree | 175479fd1f04fa91867682727b0bff43f0ebbeb7 /system | |
| parent | 8948ec977d2a2cd6962e3f6e53470d32679df4db (diff) | |
| download | nixfiles-43af8a15b95702fe27e79c1eac85a77de5a29474.tar.lz nixfiles-43af8a15b95702fe27e79c1eac85a77de5a29474.tar.zst nixfiles-43af8a15b95702fe27e79c1eac85a77de5a29474.zip | |
prefect: simplify dual-booting with grub2
Diffstat (limited to 'system')
| -rw-r--r-- | system/prefect.nix | 3 | ||||
| -rw-r--r-- | system/settings/base.nix | 4 | ||||
| -rw-r--r-- | system/settings/hardware/grub2.nix | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/system/prefect.nix b/system/prefect.nix index f015beae..3cbdcea2 100644 --- a/system/prefect.nix +++ b/system/prefect.nix @@ -14,7 +14,7 @@ ./settings/hardware/audio.nix ./settings/hardware/bare-metal.nix ./settings/hardware/mouse.nix - ./settings/hardware/systemd-boot.nix + ./settings/hardware/grub2.nix ./settings/hardware/nvidia-gpu.nix ./settings/hardware/keyboard.nix ./settings/hardware/trackball.nix @@ -33,6 +33,7 @@ Option "AllowIndirectGLXProtocol" "off" Option "TripleBuffer" "on" ''; + boot.loader.timeout = 3; fileSystems."/data" = { label = "Data"; diff --git a/system/settings/base.nix b/system/settings/base.nix index f784b6f1..0de12d64 100644 --- a/system/settings/base.nix +++ b/system/settings/base.nix @@ -1,10 +1,10 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { imports = [ ../modules/nextdns.nix ]; - boot.loader.timeout = 1; + boot.loader.timeout = lib.mkDefault 1; environment.systemPackages = with pkgs; [ nix-index diff --git a/system/settings/hardware/grub2.nix b/system/settings/hardware/grub2.nix index 70e86e71..e0043692 100644 --- a/system/settings/hardware/grub2.nix +++ b/system/settings/hardware/grub2.nix @@ -7,6 +7,7 @@ version = 2; device = "nodev"; efiSupport = true; + useOSProber = true; }; efi.canTouchEfiVariables = true; }; |