From ed779421fd970393608a745eacc6bbfcc68856b3 Mon Sep 17 00:00:00 2001
From: Dawid Dziurla <dawidd0811@gmail.com>
Date: Sun, 10 Nov 2024 11:21:53 +0100
Subject: [PATCH] podman: drop extra settings attr

---
 modules/services/podman-linux/default.nix             | 10 +++++-----
 tests/modules/services/podman-linux/configuration.nix |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/modules/services/podman-linux/default.nix b/modules/services/podman-linux/default.nix
index 3fffaca4d..abda420a1 100644
--- a/modules/services/podman-linux/default.nix
+++ b/modules/services/podman-linux/default.nix
@@ -12,13 +12,13 @@ in {
     enable = lib.mkEnableOption "Podman, a daemonless container engine";
 
     config = {
-      containers.settings = lib.mkOption {
+      containers = lib.mkOption {
         type = toml.type;
         default = { };
         description = "containers.conf configuration";
       };
 
-      storage.settings = lib.mkOption {
+      storage = lib.mkOption {
         type = toml.type;
         description = "storage.conf configuration";
       };
@@ -77,7 +77,7 @@ in {
 
     home.packages = [ cfg.package ];
 
-    services.podman.config.storage.settings = {
+    services.podman.config.storage = {
       storage.driver = lib.mkDefault "overlay";
     };
 
@@ -91,9 +91,9 @@ in {
           lib.mapAttrs (n: v: { registries = v; }) cfg.config.registries;
       };
       "containers/storage.conf".source =
-        toml.generate "storage.conf" cfg.config.storage.settings;
+        toml.generate "storage.conf" cfg.config.storage;
       "containers/containers.conf".source =
-        toml.generate "containers.conf" cfg.config.containers.settings;
+        toml.generate "containers.conf" cfg.config.containers;
     };
   };
 }
diff --git a/tests/modules/services/podman-linux/configuration.nix b/tests/modules/services/podman-linux/configuration.nix
index c86d18ad1..f9b9a4947 100644
--- a/tests/modules/services/podman-linux/configuration.nix
+++ b/tests/modules/services/podman-linux/configuration.nix
@@ -4,7 +4,7 @@
   services.podman = {
     enable = true;
     config = {
-      containers.settings = {
+      containers = {
         network = {
           default_subnet = "172.16.10.0/24";
           default_subnet_pools = [
@@ -19,7 +19,7 @@
           ];
         };
       };
-      storage.settings = {
+      storage = {
         storage = {
           runroot = "$HOME/.containers/runroot";
           graphroot = "$HOME/.containers/graphroot";