Merge remote-tracking branch 'orange/master'

1 files changed, 4 insertions, 14 deletions

diff --git a/lass/1systems/hilum/disk.nix b/lass/1systems/hilum/disk.nix
index 92640164..b5199d43 100644
--- a/lass/1systems/hilum/disk.nix
+++ b/lass/1systems/hilum/disk.nix
@@ -10,18 +10,14 @@
         partitions = [
           {
             name = "boot";
-            type = "partition";
             start = "0";
             end = "1M";
-            part-type = "primary";
             flags = ["bios_grub"];
           }
           {
-            type = "partition";
             name = "ESP";
-            start = "1MiB";
+            start = "1M";
             end = "50%";
-            fs-type = "fat32";
             bootable = true;
             content = {
               type = "filesystem";
@@ -31,18 +27,12 @@
           }
           {
             name = "root";
-            type = "partition";
             start = "50%";
             end = "100%";
             content = {
-              type = "luks";
-              name = "hilum_luks";
-              keyFile = keyFile;
-              content = {
-                type = "filesystem";
-                format = "xfs";
-                mountpoint = "/";
-              };
+              type = "filesystem";
+              format = "ext4";
+              mountpoint = "/";
             };
           }
         ];