Merge pull request #31 from nix-community/types

Reimplement using types

1 files changed, 60 insertions, 52 deletions

diff --git a/example/lvm-raid.nix b/example/lvm-raid.nix
index 48930ec..3c5ee69 100644
--- a/example/lvm-raid.nix
+++ b/example/lvm-raid.nix
@@ -1,66 +1,74 @@
 {
-  type = "devices";
-  content = {
+  disk = {
     vdb = {
-      type = "table";
-      format = "gpt";
-      partitions = [
-        {
-          type = "partition";
-          part-type = "primary";
-          start = "0%";
-          end = "100%";
-          content = {
-            type = "lvm_pv";
-            vg = "pool";
-          };
-        }
-      ];
+      type = "disk";
+      device = "/dev/vdb";
+      content = {
+        type = "table";
+        format = "gpt";
+        partitions = [
+          {
+            type = "partition";
+            name = "primary";
+            start = "0%";
+            end = "100%";
+            content = {
+              type = "lvm_pv";
+              vg = "pool";
+            };
+          }
+        ];
+      };
     };
     vdc = {
-      type = "table";
-      format = "gpt";
-      partitions = [
-        {
-          type = "partition";
-          part-type = "primary";
-          start = "0%";
-          end = "100%";
-          content = {
-            type = "lvm_pv";
-            vg = "pool";
-          };
-        }
-      ];
+      type = "disk";
+      device = "/dev/vdc";
+      content = {
+        type = "table";
+        format = "gpt";
+        partitions = [
+          {
+            type = "partition";
+            name = "primary";
+            start = "0%";
+            end = "100%";
+            content = {
+              type = "lvm_pv";
+              vg = "pool";
+            };
+          }
+        ];
+      };
     };
+  };
+  lvm_vg = {
     pool = {
       type = "lvm_vg";
-        lvs = {
-          root = {
-            type = "lvm_lv";
-            size = "100M";
+      lvs = {
+        root = {
+          type = "lvm_lv";
+          size = "100M";
+          lvm_type = "mirror";
+          content = {
+            type = "filesystem";
+            format = "ext4";
             mountpoint = "/";
-            lvm_type = "mirror";
-            content = {
-              type = "filesystem";
-              format = "ext4";
-              mountpoint = "/";
-              options = [
-                "defaults"
-              ];
-            };
+            options = [
+              "defaults"
+            ];
           };
-          home = {
-            type = "lvm_lv";
-            size = "10M";
-            lvm_type = "raid0";
-            content = {
-              type = "filesystem";
-              format = "ext4";
-              mountpoint = "/home";
-            };
+        };
+        home = {
+          type = "lvm_lv";
+          size = "10M";
+          lvm_type = "raid0";
+          content = {
+            type = "filesystem";
+            format = "ext4";
+            mountpoint = "/home";
           };
         };
+      };
     };
   };
 }