style: Apply nixpkgs-fmt and fix

Apply standard formatting and some statix conventions using;

```sh
nixpkgs-fmt **.nix && statix fix .
```

With the intent of making contribution a bit easier and reducing mental
load in hand formatting (in the same vein as [black]).

[black]: https://github.com/psf/black#the-uncompromising-code-formatter
This commit is contained in:
Chris Scutcher 2023-02-06 14:24:34 +00:00
parent b1a4ecb8ca
commit 08435eec4b
No known key found for this signature in database
GPG key ID: 19C0BED130CD39CE
23 changed files with 171 additions and 158 deletions

View file

@ -28,12 +28,12 @@
readOnly = true;
type = diskoLib.jsonType;
default =
lib.optionalAttrs (!isNull config.content) (config.content._meta [ "mdadm" config.name ]);
lib.optionalAttrs (config.content != null) (config.content._meta [ "mdadm" config.name ]);
description = "Metadata";
};
_create = diskoLib.mkCreateOption {
inherit config options;
default = {}: ''
default = _: ''
echo 'y' | mdadm --create /dev/md/${config.name} \
--level=${toString config.level} \
--raid-devices=$(wc -l $disko_devices_dir/raid_${config.name} | cut -f 1 -d " ") \
@ -42,27 +42,27 @@
--homehost=any \
$(tr '\n' ' ' < $disko_devices_dir/raid_${config.name})
udevadm trigger --subsystem-match=block; udevadm settle
${lib.optionalString (!isNull config.content) (config.content._create {dev = "/dev/md/${config.name}";})}
${lib.optionalString (config.content != null) (config.content._create {dev = "/dev/md/${config.name}";})}
'';
};
_mount = diskoLib.mkMountOption {
inherit config options;
default = {}:
lib.optionalAttrs (!isNull config.content) (config.content._mount { dev = "/dev/md/${config.name}"; });
default = _:
lib.optionalAttrs (config.content != null) (config.content._mount { dev = "/dev/md/${config.name}"; });
# TODO we probably need to assemble the mdadm somehow
};
_config = lib.mkOption {
internal = true;
readOnly = true;
default =
lib.optional (!isNull config.content) (config.content._config "/dev/md/${config.name}");
lib.optional (config.content != null) (config.content._config "/dev/md/${config.name}");
description = "NixOS configuration";
};
_pkgs = lib.mkOption {
internal = true;
readOnly = true;
type = lib.types.functionTo (lib.types.listOf lib.types.package);
default = pkgs: (lib.optionals (!isNull config.content) (config.content._pkgs pkgs));
default = pkgs: (lib.optionals (config.content != null) (config.content._pkgs pkgs));
description = "Packages";
};
};