eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-11-26 21:19:45 +01:00
Code Issues Releases Wiki Activity

podman: drop extra settings attr

Browse source
This commit is contained in:
Dawid Dziurla 2024-11-10 11:21:53 +01:00
parent c6e927e632
commit ed779421fd
No known key found for this signature in database
GPG key ID: 7B6D8368172E9B0B
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/services/podman-linux/default.nix
View file

@ -12,13 +12,13 @@ in {
enable = lib.mkEnableOption "Podman, a daemonless container engine"; enable = lib.mkEnableOption "Podman, a daemonless container engine";
config = { config = {
containers.settings = lib.mkOption { containers = lib.mkOption {
type = toml.type; type = toml.type;
default = { }; default = { };
description = "containers.conf configuration"; description = "containers.conf configuration";
}; };
storage.settings = lib.mkOption { storage = lib.mkOption {
type = toml.type; type = toml.type;
description = "storage.conf configuration"; description = "storage.conf configuration";
}; };
@ -77,7 +77,7 @@ in {
home.packages = [ cfg.package ]; home.packages = [ cfg.package ];
services.podman.config.storage.settings = { services.podman.config.storage = {
storage.driver = lib.mkDefault "overlay"; storage.driver = lib.mkDefault "overlay";
}; };
@ -91,9 +91,9 @@ in {
lib.mapAttrs (n: v: { registries = v; }) cfg.config.registries; lib.mapAttrs (n: v: { registries = v; }) cfg.config.registries;
}; };
"containers/storage.conf".source = "containers/storage.conf".source =
toml.generate "storage.conf" cfg.config.storage.settings; toml.generate "storage.conf" cfg.config.storage;
"containers/containers.conf".source = "containers/containers.conf".source =
toml.generate "containers.conf" cfg.config.containers.settings; toml.generate "containers.conf" cfg.config.containers;
}; };
}; };
} }

4
tests/modules/services/podman-linux/configuration.nix
View file

@ -4,7 +4,7 @@
services.podman = { services.podman = {
enable = true; enable = true;
config = { config = {
containers.settings = { containers = {
network = { network = {
default_subnet = "172.16.10.0/24"; default_subnet = "172.16.10.0/24";
default_subnet_pools = [ default_subnet_pools = [
@ -19,7 +19,7 @@
]; ];
}; };
}; };
storage.settings = { storage = {
storage = { storage = {
runroot = "$HOME/.containers/runroot"; runroot = "$HOME/.containers/runroot";
graphroot = "$HOME/.containers/graphroot"; graphroot = "$HOME/.containers/graphroot";