all repos — nixfiles @ 43af8a15b95702fe27e79c1eac85a77de5a29474

System and user configuration, managed by nix and home-manager

prefect: simplify dual-booting with grub2

Alan Pearce
commit

43af8a15b95702fe27e79c1eac85a77de5a29474

parent

8948ec977d2a2cd6962e3f6e53470d32679df4db

3 files changed, 5 insertions(+), 3 deletions(-)

jump to
M system/prefect.nix → system/prefect.nix
@@ -14,7 +14,7 @@ ./settings/configuration/user.nix
     ./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 "MetaModes" "2560x1440_120 +0+0 { ForceFullCompositionPipeline = On }"
     Option "AllowIndirectGLXProtocol" "off"
     Option "TripleBuffer" "on"
   '';
+  boot.loader.timeout = 3;
 
   fileSystems."/data" = {
     label = "Data";
M system/settings/base.nix → 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
M system/settings/hardware/grub2.nix → system/settings/hardware/grub2.nix
@@ -7,6 +7,7 @@ splashImage = null;
       version = 2;
       device = "nodev";
       efiSupport = true;
+      useOSProber = true;
     };
     efi.canTouchEfiVariables = true;
   };