From aaa7f0aa3d403c9852c22f73a1bb829472075879 Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Tue, 24 Sep 2024 18:43:32 -0500
Subject: [PATCH] restructured containers object

---
 enviroments/server/default.nix | 38 ++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/enviroments/server/default.nix b/enviroments/server/default.nix
index 7d7d7b5..9466c42 100644
--- a/enviroments/server/default.nix
+++ b/enviroments/server/default.nix
@@ -97,25 +97,27 @@
       oci-containers = {
         backend = "podman";
 
-        containers.pihole = let
-          passwordFileLocation = "/var/lib/pihole/webpassword.txt";
-        in {
-          image = config.apps.pihole.image;
-          volumes = [
-            "/home/pihole:/etc/pihole:rw" # TODO; set this based on configs and bond with tmpfiles.rules
-            "${config.sops.secrets."services/pi-hole".path}:${passwordFileLocation}"
-          ];
-          environment = {
-            TZ = config.time.timeZone;
-            WEBPASSWORD_FILE = passwordFileLocation;
-            PIHOLE_UID = toString config.users.users.pihole.uid;
-            PIHOLE_GID = toString config.users.groups.pihole.gid;
+        containers = {
+          pihole = let
+            passwordFileLocation = "/var/lib/pihole/webpassword.txt";
+          in {
+            image = config.apps.pihole.image;
+            volumes = [
+              "/home/pihole:/etc/pihole:rw" # TODO; set this based on configs and bond with tmpfiles.rules
+              "${config.sops.secrets."services/pi-hole".path}:${passwordFileLocation}"
+            ];
+            environment = {
+              TZ = config.time.timeZone;
+              WEBPASSWORD_FILE = passwordFileLocation;
+              PIHOLE_UID = toString config.users.users.pihole.uid;
+              PIHOLE_GID = toString config.users.groups.pihole.gid;
+            };
+            log-driver = "journald";
+            extraOptions = [
+              "--ip=${config.apps.pihole.ip}"
+              "--network=macvlan"
+            ];
           };
-          log-driver = "journald";
-          extraOptions = [
-            "--ip=${config.apps.pihole.ip}"
-            "--network=macvlan"
-          ];
         };
       };
     };