From b12eeef06d42ff437310376e436c017a67d47029 Mon Sep 17 00:00:00 2001
From: Dominik Polakovics <dominik.polakovics@cloonar.com>
Date: Fri, 1 Dec 2023 11:57:45 +0100
Subject: [PATCH] try to fix network

---
 hosts/fw.cloonar.com/modules/podman.nix | 80 ++++++++++++-------------
 1 file changed, 39 insertions(+), 41 deletions(-)

diff --git a/hosts/fw.cloonar.com/modules/podman.nix b/hosts/fw.cloonar.com/modules/podman.nix
index f93e13b..153ee06 100644
--- a/hosts/fw.cloonar.com/modules/podman.nix
+++ b/hosts/fw.cloonar.com/modules/podman.nix
@@ -6,48 +6,46 @@ in {
     podman = {
       enable = true;
       dockerCompat = true;
-      defaultNetwork.settings.dns_enabled = true;
+      defaultNetwork.settings = {
+        driver = "macvlan";
+        network_interface = "server";
+        subnets = [
+          {
+            subnet = "10.42.97.0/24";
+            gateway = "10.42.97.1";
+          }
+        ];
+        ipv6_enabled = false;
+        internal = false;
+        dns_enabled = false;
+        ipam_options = {
+          driver = "host-local";
+        };
+      };
     };
   };
 
-  environment.etc."containers/networks/servernet.json" = {
-    source = json.generate "servernet.json" ({
-      cniVersion = "0.4.0";
-      name = "servernet";
-      plugins = [
-        {
-          type = "macvlan";
-          master = "server";
-          pam = {
-            type = "dhcp";
-          };
-        }
-      ];
-    });
-  };
-
-
-  systemd.sockets."io.podman.dhcp" = {
-    description = "DHCP Client for CNI";
-    socketConfig = {
-      ListenStream = "%t/cni/dhcp.sock";
-      SocketMode = 0600;
-    };
-    wantedBy = [ "sockets.target" ];
-  };
-
-  systemd.services."io.podman.dhcp" = {
-    description = "DHCP Client CNI Service";
-    after = [ "io.podman.dhcp.socket" ];
-    requires = [ "io.podman.dhcp.socket" ];
-    wantedBy = [ "multi-user.target" "io.podman.dhcp.socket" ];
-    path = [ pkgs.cni-plugins ];
-
-    serviceConfig = {
-      Type = "simple";
-      ExecStart= "${pkgs.cni-plugins}/bin/dhcp daemon";
-      TimeoutStopSec = 30;
-      KillMode = "process";
-    };
-  };
+  # systemd.sockets."io.podman.dhcp" = {
+  #   description = "DHCP Client for CNI";
+  #   socketConfig = {
+  #     ListenStream = "%t/cni/dhcp.sock";
+  #     SocketMode = 0600;
+  #   };
+  #   wantedBy = [ "sockets.target" ];
+  # };
+  #
+  # systemd.services."io.podman.dhcp" = {
+  #   description = "DHCP Client CNI Service";
+  #   after = [ "io.podman.dhcp.socket" ];
+  #   requires = [ "io.podman.dhcp.socket" ];
+  #   wantedBy = [ "multi-user.target" "io.podman.dhcp.socket" ];
+  #   path = [ pkgs.cni-plugins ];
+  #
+  #   serviceConfig = {
+  #     Type = "simple";
+  #     ExecStart= "${pkgs.cni-plugins}/bin/dhcp daemon";
+  #     TimeoutStopSec = 30;
+  #     KillMode = "process";
+  #   };
+  # };
 }