From b2501ef9135eecb27a9e942c78040ed78d0c9c8e Mon Sep 17 00:00:00 2001
From: prescientmoon <git@moonythm.dev>
Date: Tue, 11 Jun 2024 11:37:14 +0200
Subject: [PATCH] Podman => docker

---
 hosts/nixos/common/optional/{podman.nix => oci.nix} | 9 +--------
 hosts/nixos/lapetus/services/actual.nix             | 5 ++++-
 hosts/nixos/lapetus/services/commafeed.nix          | 5 ++++-
 hosts/nixos/lapetus/services/qbittorrent.nix        | 5 ++++-
 hosts/nixos/lapetus/services/whoogle.nix            | 2 +-
 5 files changed, 14 insertions(+), 12 deletions(-)
 rename hosts/nixos/common/optional/{podman.nix => oci.nix} (58%)

diff --git a/hosts/nixos/common/optional/podman.nix b/hosts/nixos/common/optional/oci.nix
similarity index 58%
rename from hosts/nixos/common/optional/podman.nix
rename to hosts/nixos/common/optional/oci.nix
index cc698d6..e926dc4 100644
--- a/hosts/nixos/common/optional/podman.nix
+++ b/hosts/nixos/common/optional/oci.nix
@@ -1,12 +1,5 @@
 {
-  virtualisation = {
-    # podman = {
-    #   enable = true;
-    #   dockerCompat = true;
-    # };
-
-    oci-containers.backend = "docker";
-  };
+  virtualisation.oci-containers.backend = "docker";
 
 
   environment.persistence = {
diff --git a/hosts/nixos/lapetus/services/actual.nix b/hosts/nixos/lapetus/services/actual.nix
index 05a6246..269cf06 100644
--- a/hosts/nixos/lapetus/services/actual.nix
+++ b/hosts/nixos/lapetus/services/actual.nix
@@ -5,7 +5,10 @@ let
   dataDir = "/persist/state/var/lib/actual";
 in
 {
-  imports = [ ../../common/optional/services/nginx.nix ];
+  imports = [
+    ../../common/optional/services/nginx.nix
+    ../../common/optional/oci.nix
+  ];
 
   services.nginx.virtualHosts.${host} = config.satellite.proxy port { };
   systemd.tmpfiles.rules = [ "d ${dataDir}" ];
diff --git a/hosts/nixos/lapetus/services/commafeed.nix b/hosts/nixos/lapetus/services/commafeed.nix
index eb81859..e792a87 100644
--- a/hosts/nixos/lapetus/services/commafeed.nix
+++ b/hosts/nixos/lapetus/services/commafeed.nix
@@ -5,7 +5,10 @@ let
   dataDir = "/persist/state/var/lib/commafeed";
 in
 {
-  imports = [ ../../common/optional/services/nginx.nix ];
+  imports = [
+    ../../common/optional/services/nginx.nix
+    ../../common/optional/oci.nix
+  ];
 
   systemd.tmpfiles.rules = [ "d ${dataDir}" ];
   services.nginx.virtualHosts.${host} = config.satellite.proxy port
diff --git a/hosts/nixos/lapetus/services/qbittorrent.nix b/hosts/nixos/lapetus/services/qbittorrent.nix
index 031da80..b4b606a 100644
--- a/hosts/nixos/lapetus/services/qbittorrent.nix
+++ b/hosts/nixos/lapetus/services/qbittorrent.nix
@@ -8,7 +8,10 @@ let
   configDir = "/persist/state/var/lib/qbittorrent";
 in
 {
-  imports = [ ../../common/optional/services/nginx.nix ];
+  imports = [
+    ../../common/optional/services/nginx.nix
+    ../../common/optional/oci.nix
+  ];
 
   sops.secrets.vpn_env.sopsFile = ../secrets.yaml;
 
diff --git a/hosts/nixos/lapetus/services/whoogle.nix b/hosts/nixos/lapetus/services/whoogle.nix
index 9bda465..4346294 100644
--- a/hosts/nixos/lapetus/services/whoogle.nix
+++ b/hosts/nixos/lapetus/services/whoogle.nix
@@ -16,8 +16,8 @@ let
 in
 {
   imports = [
-    ../../common/optional/podman.nix
     ../../common/optional/services/nginx.nix
+    ../../common/optional/oci.nix
   ];
 
   virtualisation.oci-containers.containers.whoogle-search = {