diff --git a/src/system/machines/vm/hardware.nix b/src/system/machines/vm/hardware.nix index 21af8df..43d1680 100644 --- a/src/system/machines/vm/hardware.nix +++ b/src/system/machines/vm/hardware.nix @@ -8,18 +8,6 @@ boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; - fileSystems = { - "/" = { - device = "/dev/disk/by-uuid/79093c66-1283-44d4-b03c-f87956bbada1"; - fsType = "ext4"; - }; - - "/boot" = { - device = "/dev/disk/by-uuid/0509-1D1F"; - fsType = "vfat"; - }; - }; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; diff --git a/src/system/machines/vm/modules/disko/default.nix b/src/system/machines/vm/modules/disko/default.nix index 28d6258..398129c 100644 --- a/src/system/machines/vm/modules/disko/default.nix +++ b/src/system/machines/vm/modules/disko/default.nix @@ -4,34 +4,30 @@ disko.devices = { disk = { one = { - type = "disk"; device = builtins.elemAt disks 0; + type = "disk"; content = { - type = "table"; - format = "gpt"; - partitions = [ - { - name = "boot"; - start = "0"; - end = "200M"; - fs-type = "fat32"; - bootable = true; + type = "gpt"; + partitions = { + boot = { + size = "200M"; + type = "EF00"; content = { type = "filesystem"; format = "vfat"; mountpoint = "/boot"; }; - } - { - name = "root"; - start = "200M"; - end = "100%FREE"; + bootable = true; + priority = 1; + }; + primary = { + size = "100%"; content = { type = "lvm_pv"; vg = "vm"; }; - } - ]; + }; + }; }; }; }; @@ -49,13 +45,10 @@ root = { size = "100%"; content = { - name = "nixos"; type = "filesystem"; format = "ext4"; mountpoint = "/"; - mountOptions = [ - "defaults" - ]; + mountOptions = [ "defaults" ]; }; }; };