server: move engine to containers

5 files changed, 20 insertions, 15 deletions

diff --git a/hosts/himeji/options.nix b/hosts/himeji/options.nix
index fd2edb9..77fc36c 100644
--- a/hosts/himeji/options.nix
+++ b/hosts/himeji/options.nix
@@ -1,7 +1,10 @@
 {
   config.modules = {
     nix.extend = false;
-    server.containerEngine = "podman";
-    containers.extraOptions = [ "--restart=on-failure" ];
+
+    containers = {
+      engine = "podman";
+      extraOptions = [ "--restart=on-failure" ];
+    };
   };
 }
diff --git a/modules/options/default.nix b/modules/options/default.nix
index e0eaa38..8c140de 100644
--- a/modules/options/default.nix
+++ b/modules/options/default.nix
@@ -8,18 +8,20 @@ with lib.types;
       type = types.bool;
     };
 
-    server.containerEngine = mkOption {
-      default = "podman";
+    containers = {
+      engine = mkOption {
+        default = "podman";
 
-      type = types.enum [
-        "podman"
-        "docker"
-      ];
-    };
+        type = types.enum [
+          "podman"
+          "docker"
+        ];
+      };
 
-    containers.extraOptions = mkOption {
-      default = [ ];
-      type = types.listOf types.str;
+      extraOptions = mkOption {
+        default = [ ];
+        type = types.listOf types.str;
+      };
     };
   };
 }
diff --git a/modules/server/virtualisation/default.nix b/modules/server/virtualisation/default.nix
index dfefe98..652f3d5 100644
--- a/modules/server/virtualisation/default.nix
+++ b/modules/server/virtualisation/default.nix
@@ -8,6 +8,6 @@
 
   virtualisation = {
     containers.enable = true;
-    oci-containers.backend = config.modules.server.containerEngine;
+    oci-containers.backend = config.modules.containers.engine;
   };
 }
diff --git a/modules/server/virtualisation/docker.nix b/modules/server/virtualisation/docker.nix
index e2edf21..8f3e32b 100644
--- a/modules/server/virtualisation/docker.nix
+++ b/modules/server/virtualisation/docker.nix
@@ -1,7 +1,7 @@
 { config, ... }:
 {
   virtualisation.docker = {
-    enable = config.modules.server.containerEngine == "docker";
+    enable = config.modules.containers.engine == "docker";
     daemon.settings.iptables = false;
   };
 }
diff --git a/modules/server/virtualisation/podman.nix b/modules/server/virtualisation/podman.nix
index a8dbf2c..fafbf64 100644
--- a/modules/server/virtualisation/podman.nix
+++ b/modules/server/virtualisation/podman.nix
@@ -1,7 +1,7 @@
 { config, ... }:
 {
   virtualisation.podman = {
-    enable = config.modules.server.containerEngine == "podman";
+    enable = config.modules.containers.engine == "podman";
     dockerCompat = true;
     defaultNetwork.settings.dns_enabled = true;
   };