run nix fmt

This commit is contained in:
lassulus 2023-05-12 17:20:14 +02:00
parent 834b7b2a33
commit af27d7917d
5 changed files with 46 additions and 30 deletions

View file

@ -44,9 +44,11 @@
readOnly = true; readOnly = true;
type = diskoLib.jsonType; type = diskoLib.jsonType;
default = default =
diskoLib.deepMergeMap (lv: diskoLib.deepMergeMap
(lv:
lib.optionalAttrs (lv.content != null) (lv.content._meta [ "lvm_vg" config.name ]) lib.optionalAttrs (lv.content != null) (lv.content._meta [ "lvm_vg" config.name ])
) (lib.attrValues config.lvs); )
(lib.attrValues config.lvs);
description = "Metadata"; description = "Metadata";
}; };
_create = diskoLib.mkCreateOption { _create = diskoLib.mkCreateOption {
@ -71,9 +73,11 @@
inherit config options; inherit config options;
default = _: default = _:
let let
lvMounts = diskoLib.deepMergeMap (lv: lvMounts = diskoLib.deepMergeMap
(lv:
lib.optionalAttrs (lv.content != null) (lv.content._mount { dev = "/dev/${config.name}/${lv.name}"; }) lib.optionalAttrs (lv.content != null) (lv.content._mount { dev = "/dev/${config.name}/${lv.name}"; })
) (lib.attrValues config.lvs); )
(lib.attrValues config.lvs);
in in
{ {
dev = '' dev = ''
@ -87,21 +91,25 @@
internal = true; internal = true;
readOnly = true; readOnly = true;
default = default =
map (lv: [ map
(lv: [
(lib.optional (lv.content != null) (lv.content._config "/dev/${config.name}/${lv.name}")) (lib.optional (lv.content != null) (lv.content._config "/dev/${config.name}/${lv.name}"))
(lib.optional (lv.lvm_type != null) { (lib.optional (lv.lvm_type != null) {
boot.initrd.kernelModules = [ "dm-${lv.lvm_type}" ]; boot.initrd.kernelModules = [ "dm-${lv.lvm_type}" ];
}) })
]) (lib.attrValues config.lvs); ])
(lib.attrValues config.lvs);
description = "NixOS configuration"; description = "NixOS configuration";
}; };
_pkgs = lib.mkOption { _pkgs = lib.mkOption {
internal = true; internal = true;
readOnly = true; readOnly = true;
type = lib.types.functionTo (lib.types.listOf lib.types.package); type = lib.types.functionTo (lib.types.listOf lib.types.package);
default = pkgs: lib.flatten (map (lv: default = pkgs: lib.flatten (map
(lv:
lib.optional (lv.content != null) (lv.content._pkgs pkgs) lib.optional (lv.content != null) (lv.content._pkgs pkgs)
) (lib.attrValues config.lvs)); )
(lib.attrValues config.lvs));
description = "Packages"; description = "Packages";
}; };
}; };

View file

@ -65,9 +65,11 @@
readOnly = true; readOnly = true;
type = lib.types.functionTo diskoLib.jsonType; type = lib.types.functionTo diskoLib.jsonType;
default = dev: default = dev:
lib.foldr lib.recursiveUpdate {} (lib.imap (index: partition: lib.foldr lib.recursiveUpdate { } (lib.imap
(index: partition:
lib.optionalAttrs (partition.content != null) (partition.content._meta dev) lib.optionalAttrs (partition.content != null) (partition.content._meta dev)
) config.partitions); )
config.partitions);
description = "Metadata"; description = "Metadata";
}; };
_create = diskoLib.mkCreateOption { _create = diskoLib.mkCreateOption {
@ -99,9 +101,11 @@
inherit config options; inherit config options;
default = { dev }: default = { dev }:
let let
partMounts = lib.foldr lib.recursiveUpdate {} (lib.imap (index: partition: partMounts = lib.foldr lib.recursiveUpdate { } (lib.imap
(index: partition:
lib.optionalAttrs (partition.content != null) (partition.content._mount { dev = diskoLib.deviceNumbering dev index; }) lib.optionalAttrs (partition.content != null) (partition.content._mount { dev = diskoLib.deviceNumbering dev index; })
) config.partitions); )
config.partitions);
in in
{ {
dev = partMounts.dev or ""; dev = partMounts.dev or "";
@ -112,9 +116,11 @@
internal = true; internal = true;
readOnly = true; readOnly = true;
default = dev: default = dev:
lib.imap (index: partition: lib.imap
(index: partition:
lib.optional (partition.content != null) (partition.content._config (diskoLib.deviceNumbering dev index)) lib.optional (partition.content != null) (partition.content._config (diskoLib.deviceNumbering dev index))
) config.partitions; )
config.partitions;
description = "NixOS configuration"; description = "NixOS configuration";
}; };
_pkgs = lib.mkOption { _pkgs = lib.mkOption {
@ -122,9 +128,11 @@
readOnly = true; readOnly = true;
type = lib.types.functionTo (lib.types.listOf lib.types.package); type = lib.types.functionTo (lib.types.listOf lib.types.package);
default = pkgs: default = pkgs:
[ pkgs.parted pkgs.systemdMinimal ] ++ lib.flatten (map (partition: [ pkgs.parted pkgs.systemdMinimal ] ++ lib.flatten (map
(partition:
lib.optional (partition.content != null) (partition.content._pkgs pkgs) lib.optional (partition.content != null) (partition.content._pkgs pkgs)
) config.partitions); )
config.partitions);
description = "Packages"; description = "Packages";
}; };
}; };