From 69b4d96915445f80c5c9302ecefe026823645ec5 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 8 Mar 2026 03:35:39 +0800
Subject: [PATCH] feat: idols-akane - use docker instead of podman

---
 hosts/idols-akane/oci-containers/default.nix | 36 ++++++++++----------
 modules/nixos/base/user-group.nix            |  2 ++
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/hosts/idols-akane/oci-containers/default.nix b/hosts/idols-akane/oci-containers/default.nix
index e78ca728..14e90caa 100644
--- a/hosts/idols-akane/oci-containers/default.nix
+++ b/hosts/idols-akane/oci-containers/default.nix
@@ -7,28 +7,28 @@
 {
   imports = mylib.scanPaths ./.;
 
-  environment.systemPackages = with pkgs; [
-    podman-compose
-  ];
+  # environment.systemPackages = with pkgs; [
+  #   podman-compose
+  # ];
 
   virtualisation = {
-    docker.enable = lib.mkForce false;
-    podman = {
-      enable = true;
-      # Create a `docker` alias for podman, to use it as a drop-in replacement
-      dockerCompat = true;
-      # Required for containers under podman-compose to be able to talk to each other.
-      defaultNetwork.settings.dns_enabled = true;
-      # Periodically prune Podman resources
-      autoPrune = {
-        enable = true;
-        dates = "weekly";
-        flags = [ "--all" ];
-      };
-    };
+    docker.enable = true;
+    # podman = {
+    #   enable = true;
+    #   # Create a `docker` alias for podman, to use it as a drop-in replacement
+    #   dockerCompat = true;
+    #   # Required for containers under podman-compose to be able to talk to each other.
+    #   defaultNetwork.settings.dns_enabled = true;
+    #   # Periodically prune Podman resources
+    #   autoPrune = {
+    #     enable = true;
+    #     dates = "weekly";
+    #     flags = [ "--all" ];
+    #   };
+    # };
 
     oci-containers = {
-      backend = "podman";
+      backend = "docker";
     };
   };
 }
diff --git a/modules/nixos/base/user-group.nix b/modules/nixos/base/user-group.nix
index 0e8343a1..3ecbc83c 100644
--- a/modules/nixos/base/user-group.nix
+++ b/modules/nixos/base/user-group.nix
@@ -10,6 +10,7 @@
   users.groups = {
     "${myvars.username}" = { };
     podman = { };
+    docker = { };
     wireshark = { };
     # for android platform tools's udev rules
     adbusers = { };
@@ -31,6 +32,7 @@
       "wheel"
       "networkmanager" # for nmtui / nm-connection-editor
       "podman"
+      "docker"
       "wireshark"
       "adbusers" # android debugging
       "libvirtd" # virt-viewer / qemu