diff options
author | Leona Maroni <dev@leona.is> | 2024-05-03 22:31:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-03 22:31:06 +0200 |
commit | d9bdb87f7d3846b432aef0baa634535c34a359cf (patch) | |
tree | 425cfa08977a10effbe11043732dc542428a7b51 /nixos | |
parent | a817fdac5fea62e89332ea223c0a5ea8b6443341 (diff) | |
parent | aaa86f29269fd11b715766ffc2e42e6d37de5a39 (diff) |
Merge pull request #307498 from SuperSandro2000/podman-storage-default
nixos/containers: move storage.settings default into config
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/virtualisation/containers.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 65620dd3935b8..f5f8a16282d4e 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -53,13 +53,6 @@ in storage.settings = mkOption { type = toml.type; - default = { - storage = { - driver = "overlay"; - graphroot = "/var/lib/containers/storage"; - runroot = "/run/containers/storage"; - }; - }; description = "storage.conf configuration"; }; @@ -124,6 +117,12 @@ in }; }; + virtualisation.containers.storage.settings.storage = { + driver = "overlay"; + graphroot = "/var/lib/containers/storage"; + runroot = "/run/containers/storage"; + }; + environment.etc = { "containers/containers.conf".source = toml.generate "containers.conf" cfg.containersConf.settings; |