Use alejandra formatter / fix warnings
This commit is contained in:
parent
c5b1041bbb
commit
693d4e3c70
70 changed files with 1424 additions and 1547 deletions
|
|
@ -4,8 +4,7 @@
|
|||
options,
|
||||
pkgs,
|
||||
...
|
||||
}:
|
||||
{
|
||||
}: {
|
||||
options.mods.containers = {
|
||||
variant = lib.mkOption {
|
||||
default = "";
|
||||
|
|
@ -22,7 +21,7 @@
|
|||
podman-tui
|
||||
podman-compose
|
||||
];
|
||||
example = [ ];
|
||||
example = [];
|
||||
type = with lib.types; listOf package;
|
||||
description = "Podman packages";
|
||||
};
|
||||
|
|
@ -30,7 +29,7 @@
|
|||
default = with pkgs; [
|
||||
docker-compose
|
||||
];
|
||||
example = [ ];
|
||||
example = [];
|
||||
type = with lib.types; listOf package;
|
||||
description = "Docker packages";
|
||||
};
|
||||
|
|
@ -38,7 +37,7 @@
|
|||
default = with pkgs; [
|
||||
dive
|
||||
];
|
||||
example = [ ];
|
||||
example = [];
|
||||
type = with lib.types; listOf package;
|
||||
description = "Container packages";
|
||||
};
|
||||
|
|
@ -47,33 +46,35 @@
|
|||
lib.optionalAttrs (options ? environment.systemPackages) {
|
||||
environment.systemPackages =
|
||||
(lib.lists.optionals (
|
||||
config.mods.containers.variant == "podman"
|
||||
) config.mods.containers.podmanPackages)
|
||||
config.mods.containers.variant == "podman"
|
||||
)
|
||||
config.mods.containers.podmanPackages)
|
||||
++ (lib.lists.optionals (
|
||||
config.mods.containers.variant == "docker"
|
||||
) config.mods.containers.dockerPackages)
|
||||
config.mods.containers.variant == "docker"
|
||||
)
|
||||
config.mods.containers.dockerPackages)
|
||||
++ (lib.lists.optionals (
|
||||
config.mods.containers.variant == "podman" || config.mods.containers.variant == "docker"
|
||||
) config.mods.containers.combinedPackages);
|
||||
config.mods.containers.variant == "podman" || config.mods.containers.variant == "docker"
|
||||
)
|
||||
config.mods.containers.combinedPackages);
|
||||
virtualisation =
|
||||
if (config.mods.containers.variant == "podman") then
|
||||
{
|
||||
containers.enable = true;
|
||||
podman = {
|
||||
enable = true;
|
||||
dockerCompat = true;
|
||||
defaultNetwork.settings.dns_enabled = true;
|
||||
};
|
||||
}
|
||||
else if (config.mods.containers.variant == "docker") then
|
||||
{
|
||||
containers.enable = true;
|
||||
docker = {
|
||||
enable = true;
|
||||
};
|
||||
}
|
||||
else
|
||||
{ };
|
||||
if (config.mods.containers.variant == "podman")
|
||||
then {
|
||||
containers.enable = true;
|
||||
podman = {
|
||||
enable = true;
|
||||
dockerCompat = true;
|
||||
defaultNetwork.settings.dns_enabled = true;
|
||||
};
|
||||
}
|
||||
else if (config.mods.containers.variant == "docker")
|
||||
then {
|
||||
containers.enable = true;
|
||||
docker = {
|
||||
enable = true;
|
||||
};
|
||||
}
|
||||
else {};
|
||||
}
|
||||
);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue