types lvm_vg: inline lvm_lv type

example/complex.nix

@@ -105,7 +105,6 @@
         type = "lvm_vg";
         lvs = {
           root = {
-            type = "lvm_lv";
             size = "10M";
             lvm_type = "mirror";
             content = {
@@ -118,7 +117,6 @@
             };
           };
           raid1 = {
-            type = "lvm_lv";
             size = "30M";
             lvm_type = "raid0";
             content = {
@@ -127,7 +125,6 @@
             };
           };
           raid2 = {
-            type = "lvm_lv";
             size = "30M";
             lvm_type = "raid0";
             content = {
@@ -136,7 +133,6 @@
             };
           };
           zfs1 = {
-            type = "lvm_lv";
             size = "128M";
             lvm_type = "raid0";
             content = {
@@ -145,7 +141,6 @@
             };
           };
           zfs2 = {
-            type = "lvm_lv";
             size = "128M";
             lvm_type = "raid0";
             content = {

example/luks-lvm.nix

@@ -46,7 +46,6 @@
         type = "lvm_vg";
         lvs = {
           root = {
-            type = "lvm_lv";
             size = "100M";
             content = {
               type = "filesystem";
@@ -58,7 +57,6 @@
             };
           };
           home = {
-            type = "lvm_lv";
             size = "10M";
             content = {
               type = "filesystem";
@@ -67,7 +65,6 @@
             };
           };
           raw = {
-            type = "lvm_lv";
             size = "10M";
           };
         };

example/lvm-raid.nix

@@ -79,7 +79,6 @@
         type = "lvm_vg";
         lvs = {
           root = {
-            type = "lvm_lv";
             size = "100M";
             lvm_type = "mirror";
             content = {
@@ -92,7 +91,6 @@
             };
           };
           home = {
-            type = "lvm_lv";
             size = "10M";
             lvm_type = "raid0";
             content = {

types/default.nix

@@ -345,7 +345,6 @@ rec {
     swap = ./swap.nix;
     lvm_pv = ./lvm_pv.nix;
     lvm_vg = ./lvm_vg.nix;
-    lvm_lv = ./lvm_lv.nix;
     zfs = ./zfs.nix;
     zpool = ./zpool.nix;
     zfs_dataset = ./zfs_dataset.nix;

types/lvm_lv.nix

@@ -1,76 +0,0 @@
-{ config, options, lib, diskoLib, ... }:
-{
-  options = {
-    name = lib.mkOption {
-      type = lib.types.str;
-      default = config._module.args.name;
-      description = "Name of the logical volume";
-    };
-    type = lib.mkOption {
-      type = lib.types.enum [ "lvm_lv" ];
-      default = "lvm_lv";
-      internal = true;
-      description = "Type";
-    };
-    size = lib.mkOption {
-      type = lib.types.str; # TODO lvm size type
-      description = "Size of the logical volume";
-    };
-    lvm_type = lib.mkOption {
-      type = lib.types.nullOr (lib.types.enum [ "mirror" "raid0" "raid1" ]); # TODO add all lib.types
-      default = null; # maybe there is always a default type?
-      description = "LVM type";
-    };
-    extraArgs = lib.mkOption {
-      type = lib.types.listOf lib.types.str;
-      default = [ ];
-      description = "Extra arguments";
-    };
-    content = diskoLib.partitionType;
-    _meta = lib.mkOption {
-      internal = true;
-      readOnly = true;
-      type = lib.types.functionTo diskoLib.jsonType;
-      default = dev:
-        lib.optionalAttrs (config.content != null) (config.content._meta dev);
-      description = "Metadata";
-    };
-    _create = diskoLib.mkCreateOption {
-      inherit config options;
-      default = { vg }: ''
-        lvcreate \
-          --yes \
-          ${if lib.hasInfix "%" config.size then "-l" else "-L"} ${config.size} \
-          -n ${config.name} \
-          ${lib.optionalString (config.lvm_type != null) "--type=${config.lvm_type}"} \
-          ${toString config.extraArgs} \
-          ${vg}
-        ${lib.optionalString (config.content != null) (config.content._create {dev = "/dev/${vg}/${config.name}";})}
-      '';
-    };
-    _mount = diskoLib.mkMountOption {
-      inherit config options;
-      default = { vg }:
-        lib.optionalAttrs (config.content != null) (config.content._mount { dev = "/dev/${vg}/${config.name}"; });
-    };
-    _config = lib.mkOption {
-      internal = true;
-      readOnly = true;
-      default = vg:
-        [
-          (lib.optional (config.content != null) (config.content._config "/dev/${vg}/${config.name}"))
-          (lib.optional (config.lvm_type != null) {
-            boot.initrd.kernelModules = [ "dm-${config.lvm_type}" ];
-          })
-        ];
-      description = "NixOS configuration";
-    };
-    _pkgs = lib.mkOption {
-      internal = true;
-      readOnly = true;
-      type = lib.types.functionTo (lib.types.listOf lib.types.package);
-      default = pkgs: lib.optionals (config.content != null) (config.content._pkgs pkgs);
-      description = "Packages";
-    };
-  };
-}

types/lvm_vg.nix

@@ -12,7 +12,30 @@
       description = "Type";
     };
     lvs = lib.mkOption {
-      type = lib.types.attrsOf subTypes.lvm_lv;
+      type = lib.types.attrsOf (lib.types.submodule ({ config, ... }: {
+        options = {
+          name = lib.mkOption {
+            type = lib.types.str;
+            default = config._module.args.name;
+            description = "Name of the logical volume";
+          };
+          size = lib.mkOption {
+            type = lib.types.str; # TODO lvm size type
+            description = "Size of the logical volume";
+          };
+          lvm_type = lib.mkOption {
+            type = lib.types.nullOr (lib.types.enum [ "mirror" "raid0" "raid1" ]); # TODO add all lib.types
+            default = null; # maybe there is always a default type?
+            description = "LVM type";
+          };
+          extraArgs = lib.mkOption {
+            type = lib.types.listOf lib.types.str;
+            default = [ ];
+            description = "Extra arguments";
+          };
+          content = diskoLib.partitionType;
+        };
+      }));
       default = { };
       description = "LVS for the volume group";
     };
@@ -21,7 +44,9 @@
       readOnly = true;
       type = diskoLib.jsonType;
       default =
-        diskoLib.deepMergeMap (lv: lv._meta [ "lvm_vg" config.name ]) (lib.attrValues config.lvs);
+        diskoLib.deepMergeMap (lv:
+          lib.optionalAttrs (lv.content != null) (lv.content._meta [ "lvm_vg" config.name ])
+        ) (lib.attrValues config.lvs);
       description = "Metadata";
     };
     _create = diskoLib.mkCreateOption {
@@ -30,14 +55,25 @@
         readarray -t lvm_devices < <(cat "$disko_devices_dir"/lvm_${config.name})
         vgcreate ${config.name} \
         "''${lvm_devices[@]}"
-        ${lib.concatMapStrings (lv: lv._create {vg = config.name; }) (lib.attrValues config.lvs)}
+        ${lib.concatMapStrings (lv: ''
+          lvcreate \
+            --yes \
+            ${if lib.hasInfix "%" lv.size then "-l" else "-L"} ${lv.size} \
+            -n ${lv.name} \
+            ${lib.optionalString (lv.lvm_type != null) "--type=${lv.lvm_type}"} \
+            ${toString lv.extraArgs} \
+            ${config.name}
+          ${lib.optionalString (lv.content != null) (lv.content._create {dev = "/dev/${config.name}/${lv.name}";})}
+        '') (lib.attrValues config.lvs)}
       '';
     };
     _mount = diskoLib.mkMountOption {
       inherit config options;
       default = _:
         let
-          lvMounts = diskoLib.deepMergeMap (lv: lv._mount { vg = config.name; }) (lib.attrValues config.lvs);
+          lvMounts = diskoLib.deepMergeMap (lv:
+            lib.optionalAttrs (lv.content != null) (lv.content._mount { dev = "/dev/${config.name}/${lv.name}"; })
+          ) (lib.attrValues config.lvs);
         in
         {
           dev = ''
@@ -51,14 +87,21 @@
       internal = true;
       readOnly = true;
       default =
-        map (lv: lv._config config.name) (lib.attrValues config.lvs);
+        map (lv: [
+          (lib.optional (lv.content != null) (lv.content._config "/dev/${config.name}/${lv.name}"))
+          (lib.optional (lv.lvm_type != null) {
+            boot.initrd.kernelModules = [ "dm-${lv.lvm_type}" ];
+          })
+        ]) (lib.attrValues config.lvs);
       description = "NixOS configuration";
     };
     _pkgs = lib.mkOption {
       internal = true;
       readOnly = true;
       type = lib.types.functionTo (lib.types.listOf lib.types.package);
-      default = pkgs: lib.flatten (map (lv: lv._pkgs pkgs) (lib.attrValues config.lvs));
+      default = pkgs: lib.flatten (map (lv:
+        lib.optional (lv.content != null) (lv.content._pkgs pkgs)
+      ) (lib.attrValues config.lvs));
       description = "Packages";
     };
   };