nix/configuration/configuration.nix

@@ -49,7 +49,6 @@
     ./roles/nvme
     ./roles/optimized_build
     ./roles/pcsx2
-    ./roles/podman
     ./roles/python
     ./roles/qemu
     ./roles/reset

nix/configuration/hosts/odo/default.nix

@@ -67,7 +67,7 @@
   me.chromium.enable = true;
   me.d2.enable = true;
   me.direnv.enable = true;
-  me.docker.enable = false;
+  me.docker.enable = true;
   me.ecc.enable = false;
   me.emacs_flavor = "full";
   me.firefox.enable = true;
@@ -87,7 +87,6 @@
   me.media.enable = true;
   me.nix_index.enable = true;
   me.pcsx2.enable = true;
-  me.podman.enable = true;
   me.python.enable = true;
   me.qemu.enable = true;
   me.rpcs3.enable = true;

nix/configuration/hosts/quark/default.nix

@@ -62,7 +62,7 @@
     me.chromium.enable = true;
     me.d2.enable = true;
     me.direnv.enable = true;
-    me.docker.enable = false;
+    me.docker.enable = true;
     me.ecc.enable = true;
     me.emacs_flavor = "full";
     me.firefox.enable = true;
@@ -83,7 +83,6 @@
     me.nix_index.enable = true;
     me.nix_worker.enable = true;
     me.pcsx2.enable = true;
-    me.podman.enable = true;
     me.python.enable = true;
     me.qemu.enable = true;
     me.rpcs3.enable = true;

nix/configuration/roles/docker/default.nix

@@ -19,14 +19,6 @@
 
   config = lib.mkIf config.me.docker.enable (
     lib.mkMerge [
-      {
-        assertions = [
-          {
-            assertion = !config.me.podman.enable;
-            message = "docker conflicts with podman";
-          }
-        ];
-      }
       {
         virtualisation.docker.enable = true;
         # Use docker activation

nix/configuration/roles/podman/default.nix

@@ -1,80 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  options.me = {
-    podman.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install podman.";
-    };
-  };
-
-  config = lib.mkIf config.me.podman.enable (
-    lib.mkMerge [
-      {
-        assertions = [
-          {
-            assertion = !config.me.docker.enable;
-            message = "podman conflicts with docker";
-          }
-        ];
-      }
-      {
-        environment.systemPackages = with pkgs; [
-          dive
-          podman-tui
-          podman-compose
-        ];
-
-        # Write config files in /etc/containers
-        virtualisation.containers.enable = true;
-        # By default this includes "quay.io" which leads to prompting for which registry to download from.
-        virtualisation.containers.registries.search = [ "docker.io" ];
-        virtualisation = {
-          podman = {
-            enable = true;
-            # Install docker shim
-            dockerCompat = true;
-            # Support name resolution in podman-compose.
-            defaultNetwork.settings.dns_enabled = true;
-          };
-        };
-
-        environment.variables = {
-          # For compatibility with tools expecting a docker socket (like dive).
-          DOCKER_HOST = "unix://$XDG_RUNTIME_DIR/podman/podman.sock";
-        };
-
-        environment.persistence."/state" = lib.mkIf (!config.me.buildingIso) {
-          hideMounts = true;
-          directories = [
-            {
-              directory = "/var/lib/containers";
-              user = "root";
-              group = "root";
-              mode = "0755";
-            }
-          ];
-          users.talexander = {
-            directories = [
-              {
-                directory = ".local/share/containers";
-                user = "talexander";
-                group = "talexander";
-                mode = "0700";
-              }
-            ];
-          };
-        };
-      }
-    ]
-  );
-}