diff --git a/systems/x86_64-linux/pegasi/disk-config.nix b/systems/x86_64-linux/pegasi/disk-config.nix index a62b817..93921d7 100644 --- a/systems/x86_64-linux/pegasi/disk-config.nix +++ b/systems/x86_64-linux/pegasi/disk-config.nix @@ -1,5 +1,45 @@ { ... }: { disko.devices = { + # The ZFS pool already exists, and therefore is not configured here. + disk = { + osdisk = { + device = "/dev/disk/by-id/scsi-36782bcb05b9aca002b6c740f07124060"; + type = "disk"; + content = { + type = "gpt"; + partitions = { + boot = { + size = "1M"; + type = "EF02"; # for grub MBR + }; + ESP = { + type = "EF00"; + size = "512M"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + }; + }; + sysroot = { + size = "100%"; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/"; + }; + }; + swap = { + size = "50G"; + content = { + type = "swap"; + randomEncryption = true; + }; + }; + }; + }; + }; + }; }; } diff --git a/systems/x86_64-linux/pegasi/hardware.nix b/systems/x86_64-linux/pegasi/hardware.nix index e81db21..d9af5c1 100644 --- a/systems/x86_64-linux/pegasi/hardware.nix +++ b/systems/x86_64-linux/pegasi/hardware.nix @@ -12,8 +12,8 @@ # Bootloader config boot.initrd.availableKernelModules = [ - "ehci_pci" "ahci" "sd_mod" "sr_mod" - "isci" "usb_storage" "usbhid" + "uhci_hcd" "ehci_pci" "megaraid_sas" + "sd_mod" "usb_storage" "usbhid" ]; boot.initrd.kernelModules = [ "dm-snapshot" ]; boot.kernelModules = [ "kvm-intel" ]; @@ -22,7 +22,8 @@ boot.loader.grub = { enable = true; - device = config.disko.devices.disk.boot.device; + device = config.disko.devices.disk.osdisk.device; + efiSupport = true; configurationLimit = 5; }; @@ -33,6 +34,7 @@ # Networking config networking.hostId = "0bdd5f68"; + networking.interfaces.eno2.wakeOnLan.enable = true; networking.useDHCP = true; # Hardware config