From c4a7c711fbb731e6c71852f0f08cad50fab5c7cb Mon Sep 17 00:00:00 2001
From: Leyla Becker <git@jan-leila.com>
Date: Thu, 6 Mar 2025 13:09:38 -0600
Subject: [PATCH] updated network config for defiant

---
 .../nixos/defiant/configuration.nix           |  8 -----
 .../nixos/defiant/hardware-configuration.nix  | 33 +++++--------------
 2 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/configurations/nixos/defiant/configuration.nix b/configurations/nixos/defiant/configuration.nix
index de267d3..bfd5a50 100644
--- a/configurations/nixos/defiant/configuration.nix
+++ b/configurations/nixos/defiant/configuration.nix
@@ -87,13 +87,6 @@
         };
       };
     };
-    # podman = {
-    #   macvlan = {
-    #     subnet = "192.168.1.0/24";
-    #     gateway = "192.168.1.1";
-    #     networkInterface = "bond0";
-    #   };
-    # };
     jellyfin = {
       enable = true;
       subdomain = "media";
@@ -113,7 +106,6 @@
     };
     pihole = {
       enable = true;
-      # ip = "192.168.1.201";
     };
     nextcloud = {
       enable = true;
diff --git a/configurations/nixos/defiant/hardware-configuration.nix b/configurations/nixos/defiant/hardware-configuration.nix
index f312f88..da19108 100644
--- a/configurations/nixos/defiant/hardware-configuration.nix
+++ b/configurations/nixos/defiant/hardware-configuration.nix
@@ -35,12 +35,6 @@
   networking = {
     hostName = "defiant"; # Define your hostname.
     useNetworkd = true;
-    interfaces = {
-      bond0.useDHCP = lib.mkDefault true;
-      bonding_masters.useDHCP = lib.mkDefault true;
-      enol.useDHCP = lib.mkDefault true;
-      eno2.useDHCP = lib.mkDefault true;
-    };
   };
 
   systemd.network = {
@@ -60,33 +54,24 @@
     };
 
     networks = {
-      "30-enp4s0" = {
-        matchConfig.Name = "enp4s0";
+      "30-eno1" = {
+        matchConfig.Name = "eno1";
         networkConfig.Bond = "bond0";
-
-        address = [
-          # configure addresses including subnet mask
-          "192.168.2.1/24"
-        ];
       };
-      "30-enp5s0" = {
-        matchConfig.Name = "enp5s0";
+      "30-eno2" = {
+        matchConfig.Name = "eno2";
         networkConfig.Bond = "bond0";
-
-        address = [
-          # configure addresses including subnet mask
-          "192.168.2.2/24"
-        ];
       };
 
       "40-bond0" = {
         matchConfig.Name = "bond0";
-        linkConfig.RequiredForOnline = "carrier";
-        networkConfig.LinkLocalAddressing = "no";
-        DHCP = "ipv4";
+        linkConfig = {
+          RequiredForOnline = "degraded-carrier";
+          RequiredFamilyForOnline = "any";
+        };
+        networkConfig.DHCP = "yes";
 
         address = [
-          # configure addresses including subnet mask
           "192.168.1.10/24"
         ];
       };