added config options for pihole

enviroments/server/default.nix

@@ -13,6 +13,33 @@
       base_domain = lib.mkOption {
         type = lib.types.str;
       };
+      macvlan = {
+        subnet = lib.mkOption {
+          type = lib.types.str;
+          description = "Subnet for macvlan address range";
+        };
+        gateway = lib.mkOption {
+          type = lib.types.str;
+          description = "Gateway for macvlan";
+          # TODO: see if we can default this to systemd network gateway
+        };
+        networkInterface = lib.mkOption {
+          type = lib.types.str;
+          description = "Parent network interface for macvlan";
+          # TODO: see if we can default this some interface?
+        };
+      };
+      pihole = {
+        image = lib.mkOption {
+          type = lib.types.str;
+          description = "container image to use for pi-hole";
+        };
+        # TODO: check against subnet for macvlan
+        ip = lib.mkOption {
+          type = lib.types.str;
+          description = "ip address to use for pi-hole";
+        };
+      };
       headscale = {
         subdomain = lib.mkOption {
           type = lib.types.str;
@@ -54,8 +81,9 @@
       };
     };
 
+    virtualisation = {
       # Runtime
-    virtualisation.podman = {
+      podman = {
         enable = true;
         autoPrune.enable = true;
         dockerCompat = true;
@@ -64,27 +92,32 @@
           dns_enabled = true;
         };
       };
-    virtualisation.oci-containers.backend = "podman";
 
-    virtualisation.oci-containers.containers.pihole = {
+      oci-containers = {
-      image = "pihole/pihole:2024.07.0";
+        backend = "podman";
-      hostname = "pihole";
+
+        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
+            "/home/pihole:/etc/pihole:rw" # TODO; set this based on configs and bond with tmpfiles.rules
-        "${config.sops.secrets."services/pi-hole".path}:/var/lib/pihole/webpassword.txt"
+            "${config.sops.secrets."services/pi-hole".path}:${passwordFileLocation}"
           ];
           environment = {
             TZ = config.time.timeZone;
-        WEBPASSWORD_FILE = "/var/lib/pihole/webpassword.txt";
+            WEBPASSWORD_FILE = passwordFileLocation;
             PIHOLE_UID = toString config.users.users.pihole.uid;
             PIHOLE_GID = toString config.users.groups.pihole.gid;
           };
           log-driver = "journald";
           extraOptions = [
-        "--ip=192.168.1.201" # TODO: set this to some ip address from configs
+            "--ip=${config.apps.pihole.ip}"
             "--network=macvlan"
           ];
         };
+      };
+    };
 
     systemd = {
       tmpfiles.rules = [
@@ -123,11 +156,8 @@
             RemainAfterExit = true;
             ExecStop = "podman network rm -f macvlan";
           };
-          # TODO: check subnet against pi-hole ip address
-          # TODO: make lan configurable
-          # TODO: make parent interface configurable
           script = ''
-            podman network inspect macvlan || podman network create --driver macvlan --subnet 192.168.1.0/24 --gateway 192.168.1.1 --opt parent=bond0 macvlan
+            podman network inspect macvlan || podman network create --driver macvlan --subnet ${config.apps.macvlan.subnet} --gateway ${config.apps.macvlan.gateway} --opt parent=${config.apps.macvlan.networkInterface} macvlan
           '';
           partOf = [ "podman-compose-root.target" ];
           wantedBy = [ "podman-compose-root.target" ];

hosts/defiant/configuration.nix

@@ -25,9 +25,24 @@
 
   apps = {
     base_domain = "jan-leila.com";
-    headscale.subdomain = "vpn";
+    macvlan = {
-    jellyfin.subdomain = "media";
+      subnet = "192.168.1.0/24";
-    forgejo.subdomain = "git";
+      gateway = "192.168.1.1";
+      networkInterface = "bond0";
+    };
+    pihole = {
+      image = "pihole/pihole:2024.07.0";
+      ip = "192.168.1.201";
+    };
+    headscale = {
+      subdomain = "vpn";
+    };
+    jellyfin = {
+      subdomain = "media";
+    };
+    forgejo = {
+      subdomain = "git";
+    };
   };
 
   services = {