diff --git a/machines/newton/configuration.nix b/machines/newton/configuration.nix index c341651..ac5eb72 100644 --- a/machines/newton/configuration.nix +++ b/machines/newton/configuration.nix @@ -2,6 +2,7 @@ { imports = [ ./boot.nix + ./disko-config.nix ./hardware-configuration.nix ./network.nix ./services.nix @@ -9,10 +10,6 @@ ./system.nix ]; - disko.devices = import ./disko-config.nix { - disks = [ "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0" ]; - }; - networking.hostName = "newton"; sops = { diff --git a/machines/newton/disko-config.nix b/machines/newton/disko-config.nix index e72dbca..f7c1233 100644 --- a/machines/newton/disko-config.nix +++ b/machines/newton/disko-config.nix @@ -1,71 +1,72 @@ -{ disks ? [ "/dev/sda" ], ... }: { - disk = { - vdb = { - type = "disk"; - device = builtins.head disks; - content = { - type = "gpt"; - partitions = { - boot = { - size = "1M"; - type = "EF02"; # for grub MBR - }; - ESP = { - size = "512M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; - mountOptions = [ - "defaults" - ]; + disko.devices = { + disk = { + vdb = { + type = "disk"; + device = "/dev/disk/by-id/scsi-0QEMU_QEMU_HARDDISK_drive-scsi0"; + content = { + type = "gpt"; + partitions = { + boot = { + size = "1M"; + type = "EF02"; # for grub MBR }; - }; - luks = { - size = "100%"; - content = { - type = "luks"; - name = "encrypted"; - extraOpenArgs = [ "--allow-discards" ]; - passwordFile = "/tmp/disk.key"; + ESP = { + size = "512M"; + type = "EF00"; content = { - type = "lvm_pv"; - vg = "pool"; + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = [ + "defaults" + ]; + }; + }; + luks = { + size = "100%"; + content = { + type = "luks"; + name = "encrypted"; + extraOpenArgs = [ "--allow-discards" ]; + passwordFile = "/tmp/disk.key"; + content = { + type = "lvm_pv"; + vg = "pool"; + }; }; }; }; }; }; }; - }; - lvm_vg = { - pool = { - type = "lvm_vg"; - lvs = { - root = { - size = "100G"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; + lvm_vg = { + pool = { + type = "lvm_vg"; + lvs = { + root = { + size = "100G"; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/"; + }; }; - }; - data = { - size = "350G"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/data"; + data = { + size = "350G"; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/data"; + }; }; - }; - swap = { - size = "4G"; - content = { - type = "swap"; - randomEncryption = true; - resumeDevice = true; + swap = { + size = "4G"; + content = { + type = "swap"; + randomEncryption = true; + resumeDevice = true; + }; }; }; };