summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlassulus <lassulus@lassul.us>2022-10-23 11:30:08 +0200
committerlassulus <lassulus@lassul.us>2022-10-23 11:36:56 +0200
commit3c4cc930077f88fd1bb6331e26dcbcf7efa7478e (patch)
tree6db40cbdce8ebcdd82e159913a8876af26b7e835
parent5aa3ebcb998c1d489926e4f702ee98f5175240e6 (diff)
export config list in types
-rw-r--r--default.nix2
-rw-r--r--types.nix4
2 files changed, 2 insertions, 4 deletions
diff --git a/default.nix b/default.nix
index 3fe2bbb..4a81f03 100644
--- a/default.nix
+++ b/default.nix
@@ -16,6 +16,6 @@ in {
types = types;
create = cfg: types.diskoLib.create (eval cfg).config.devices;
mount = cfg: types.diskoLib.mount (eval cfg).config.devices;
- config = cfg: types.diskoLib.config (eval cfg).config.devices;
+ config = cfg: { imports = types.diskoLib.config (eval cfg).config.devices; };
packages = cfg: types.diskoLib.packages (eval cfg).config.devices;
}
diff --git a/types.nix b/types.nix
index db70ede..6c35de6 100644
--- a/types.nix
+++ b/types.nix
@@ -156,9 +156,7 @@ rec {
config :: types.devices -> nixosConfig
*/
- config = devices: {
- imports = flatten (map (dev: dev._config) (flatten (map attrValues (attrValues devices))));
- };
+ config = devices: flatten (map (dev: dev._config) (flatten (map attrValues (attrValues devices))));
/* Takes a disko device specification and returns a function to get the needed packages to format/mount the disks
packages :: types.devices -> pkgs -> [ derivation ]