Merge pull request #307498 from SuperSandro2000/podman-storage-default

nixos/containers: move storage.settings default into config
2024-05-03 22:31:06 +02:00
parent a817fdac5f aaa86f2926
commit d9bdb87f7d
1 changed files with 6 additions and 7 deletions
@@ -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;