reimplement disko using the nixos type system

This should make the code cleaner, more robust and errors should be
clearer. we also changed the configuration format a bit.

2 files changed, 21 insertions, 1 deletions

diff --git a/tests/complex.nix b/tests/complex.nix
new file mode 100644
index 0000000..3fa861e
--- /dev/null
+++ b/tests/complex.nix
@@ -0,0 +1,20 @@
+{ pkgs ? (import <nixpkgs> { })
+, makeDiskoTest ? (pkgs.callPackage ./lib.nix { }).makeDiskoTest
+}:
+makeDiskoTest {
+  disko-config = import ../example/complex.nix;
+  extraTestScript = ''
+    machine.succeed("test -b /dev/zroot/zfs_testvolume");
+    machine.succeed("test -b /dev/md/raid1p1");
+
+
+    machine.succeed("mountpoint /mnt");
+    machine.succeed("mountpoint /mnt/zfs_fs");
+    machine.succeed("mountpoint /mnt/zfs_legacy_fs");
+    machine.succeed("mountpoint /mnt/ext4onzfs");
+    machine.succeed("mountpoint /mnt/ext4_on_lvm");
+  '';
+  extraConfig = {
+    boot.kernelModules = [ "dm-raid" "dm-mirror" ];
+  };
+}
diff --git a/tests/lib.nix b/tests/lib.nix
index 2ec42e6..0bcba2b 100644
--- a/tests/lib.nix
+++ b/tests/lib.nix
@@ -17,7 +17,7 @@
         };
       tsp-create = pkgs.writeScript "create" ((pkgs.callPackage ../. { }).create disko-config);
       tsp-mount = pkgs.writeScript "mount" ((pkgs.callPackage ../. { }).mount disko-config);
-      num-disks = builtins.length (builtins.filter (x: builtins.match "vd." x == [ ]) (lib.attrNames disko-config.content));
+      num-disks = builtins.length (lib.attrNames disko-config.disk);
     in
     makeTest' {
       name = "disko";