apply deadnix

This commit is contained in:
Jörg Thalheim 2023-06-06 13:32:47 +02:00
parent 29d632d7e8
commit a8d85d9f89
15 changed files with 16 additions and 29 deletions

View file

@ -11,7 +11,7 @@ let
name = "subType";
description = "one of ${concatStringsSep "," (attrNames typeAttr)}";
check = x: if x ? type then typeAttr.${x.type}.check x else throw "No type option set in:\n${generators.toPretty {} x}";
merge = loc: foldl' (res: def: typeAttr.${def.value.type}.merge loc [ def ]) { };
merge = loc: foldl' (_res: def: typeAttr.${def.value.type}.merge loc [ def ]) { };
nestedTypes = typeAttr;
};
@ -171,10 +171,6 @@ let
readOnly = true;
type = lib.types.functionTo lib.types.str;
default = args:
let
name = "format";
test = lib.optionalString (config ? name) "${config.${name}}";
in
''
( # ${config.type} ${concatMapStringsSep " " (n: toString (config.${n} or "")) ["name" "device" "format" "mountpoint"]}
${diskoLib.defineHookVariables { inherit config options; }}

View file

@ -59,7 +59,7 @@
internal = true;
readOnly = true;
type = lib.types.functionTo diskoLib.jsonType;
default = dev: { };
default = _dev: { };
description = "Metadata";
};
_create = diskoLib.mkCreateOption {

View file

@ -29,7 +29,7 @@
internal = true;
readOnly = true;
type = lib.types.functionTo diskoLib.jsonType;
default = dev: { };
default = _dev: { };
description = "Metadata";
};
_create = diskoLib.mkCreateOption {

View file

@ -34,7 +34,7 @@
_config = lib.mkOption {
internal = true;
readOnly = true;
default = dev: [ ];
default = _dev: [ ];
description = "NixOS configuration";
};
_pkgs = lib.mkOption {

View file

@ -34,7 +34,7 @@
_config = lib.mkOption {
internal = true;
readOnly = true;
default = dev: [ ];
default = _dev: [ ];
description = "NixOS configuration";
};
_pkgs = lib.mkOption {

View file

@ -65,7 +65,7 @@
internal = true;
readOnly = true;
type = lib.types.functionTo (lib.types.listOf lib.types.package);
default = pkgs: [ ];
default = _pkgs: [ ];
description = "Packages";
};
};

View file

@ -15,7 +15,7 @@
internal = true;
readOnly = true;
type = lib.types.functionTo diskoLib.jsonType;
default = dev: { };
default = _dev: { };
description = "Metadata";
};
_create = diskoLib.mkCreateOption {

View file

@ -12,7 +12,7 @@
description = "The kind of partition table";
};
partitions = lib.mkOption {
type = lib.types.listOf (lib.types.submodule ({ config, ... }: {
type = lib.types.listOf (lib.types.submodule ({ ... }: {
options = {
part-type = lib.mkOption {
type = lib.types.enum [ "primary" "logical" "extended" ];
@ -60,7 +60,7 @@
type = lib.types.functionTo diskoLib.jsonType;
default = dev:
lib.foldr lib.recursiveUpdate { } (lib.imap
(index: partition:
(_index: partition:
lib.optionalAttrs (partition.content != null) (partition.content._meta dev)
)
config.partitions);

View file

@ -33,7 +33,7 @@
_config = lib.mkOption {
internal = true;
readOnly = true;
default = dev: [ ];
default = _dev: [ ];
description = "NixOS configuration";
};
_pkgs = lib.mkOption {

View file

@ -33,7 +33,7 @@
internal = true;
readOnly = true;
type = lib.types.functionTo diskoLib.jsonType;
default = dev: { };
default = _dev: { };
description = "Metadata";
};
_create = diskoLib.mkCreateOption {

View file

@ -1,4 +1,4 @@
{ config, options, lib, diskoLib, rootMountPoint, ... }:
{ config, options, lib, diskoLib, ... }:
{
options = {
name = lib.mkOption {