summaryrefslogtreecommitdiff
path: root/machines
diff options
context:
space:
mode:
Diffstat (limited to 'machines')
-rw-r--r--machines/dragon.nix1
-rw-r--r--machines/x1-pincer.nix4
2 files changed, 2 insertions, 3 deletions
diff --git a/machines/dragon.nix b/machines/dragon.nix
index ca43995..a264060 100644
--- a/machines/dragon.nix
+++ b/machines/dragon.nix
@@ -77,7 +77,6 @@ in {
terminal_output serial
'';
loader.grub.enable = true;
- loader.grub.version = 2;
# loader.grub.devices = [ "/dev/sda" "/dev/sdb" ];
loader.grub.mirroredBoots = [
{ devices = [ "/dev/disk/by-id/ata-HGST_HDN724040ALE640_PK1334PCKEXU9X" ]; path = "/mnt/boot1"; }
diff --git a/machines/x1-pincer.nix b/machines/x1-pincer.nix
index fca4bab..2a899bc 100644
--- a/machines/x1-pincer.nix
+++ b/machines/x1-pincer.nix
@@ -75,7 +75,6 @@ let ports = {
boot = {
loader.grub = {
enable = true;
- version = 2;
device = "nodev";
efiSupport = true;
ipxe = {
@@ -90,7 +89,8 @@ let ports = {
};
};
loader.efi.canTouchEfiVariables = true;
- kernelPackages = pkgs.linuxPackages_latest;
+ # 6.4 is broken: https://github.com/NixOS/nixpkgs/issues/243830
+ # kernelPackages = pkgs.linuxPackages_latest;
kernelModules = ["xpad" "kvm-intel" ];
initrd.luks.devices = {