refactor(nix): order let bindings
This commit was merged in pull request #103.
This commit is contained in:
@@ -8,6 +8,7 @@
|
||||
util,
|
||||
}:
|
||||
let
|
||||
files = util.collectNixFiles root;
|
||||
mkGuest =
|
||||
name:
|
||||
{ config, lib, ... }:
|
||||
@@ -167,22 +168,22 @@ let
|
||||
config = lib.mkIf cfg.enable {
|
||||
assertions =
|
||||
let
|
||||
hasDirectorySettings = mount: mount.owner != null || mount.group != null || mount.mode != null;
|
||||
hasCompleteDirectorySettings =
|
||||
mount: mount.owner != null && mount.group != null && mount.mode != null;
|
||||
hasOneSource = mount: (mount.directory != null) != (mount.file != null);
|
||||
mountsWithInvalidSource = lib.attrNames (
|
||||
lib.filterAttrs (_: mount: !hasOneSource mount) cfg.mounts
|
||||
);
|
||||
hasOneSource = mount: (mount.directory != null) != (mount.file != null);
|
||||
fileMountsWithHostSettings = lib.attrNames (
|
||||
lib.filterAttrs (_: mount: mount.file != null && hasDirectorySettings mount) cfg.mounts
|
||||
);
|
||||
hasDirectorySettings = mount: mount.owner != null || mount.group != null || mount.mode != null;
|
||||
directoryMountsWithPartialHostSettings = lib.attrNames (
|
||||
lib.filterAttrs (
|
||||
_: mount:
|
||||
mount.directory != null && hasDirectorySettings mount && !hasCompleteDirectorySettings mount
|
||||
) cfg.mounts
|
||||
);
|
||||
hasCompleteDirectorySettings =
|
||||
mount: mount.owner != null && mount.group != null && mount.mode != null;
|
||||
in
|
||||
[
|
||||
{
|
||||
@@ -275,11 +276,10 @@ let
|
||||
};
|
||||
};
|
||||
|
||||
files = util.collectNixFiles root;
|
||||
names = map (file: lib.removeSuffix ".nix" file) (lib.attrNames guestFiles);
|
||||
guestFiles = lib.filterAttrs (file: type: type == "regular" && lib.hasSuffix ".nix" file) (
|
||||
builtins.readDir root
|
||||
);
|
||||
names = map (file: lib.removeSuffix ".nix" file) (lib.attrNames guestFiles);
|
||||
in
|
||||
{
|
||||
imports = files ++ map mkGuest names;
|
||||
|
||||
@@ -9,6 +9,8 @@
|
||||
registryModule,
|
||||
}:
|
||||
let
|
||||
names = lib.attrNames directories;
|
||||
directories = lib.filterAttrs (_name: type: type == "directory") (builtins.readDir root);
|
||||
mkHost =
|
||||
{
|
||||
root,
|
||||
@@ -36,7 +38,5 @@ let
|
||||
];
|
||||
};
|
||||
|
||||
directories = lib.filterAttrs (_name: type: type == "directory") (builtins.readDir root);
|
||||
names = lib.attrNames directories;
|
||||
in
|
||||
lib.genAttrs names (name: mkHost { inherit root name; })
|
||||
|
||||
Reference in New Issue
Block a user