From 149690d3405c8906d0d93c1c9b09d9cdb55e8ed0 Mon Sep 17 00:00:00 2001
From: James Andariese <james@strudelline.net>
Date: Fri, 18 Apr 2025 23:43:39 +0000
Subject: [PATCH] fix yveltal bridge config

---
 hosts/yveltal.nix | 11 +++++++++--
 types/server.nix  |  1 -
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/hosts/yveltal.nix b/hosts/yveltal.nix
index 2fb052a..8928c09 100644
--- a/hosts/yveltal.nix
+++ b/hosts/yveltal.nix
@@ -4,7 +4,9 @@
 
 { config, pkgs, lib, inputs, ... }:
 
-let bridge = bridge: {mac, iface, ip}@_in: {
+let bridge = bridge: {mac, iface, ip, gateway}@_in: {
+      systemd.network.enable = true;
+
       systemd.network.links."${iface}" = {
         linkConfig.Name = iface;
         matchConfig.PermanentMACAddress = mac;
@@ -13,6 +15,10 @@ let bridge = bridge: {mac, iface, ip}@_in: {
         enable = true;
         bridge = [ bridge ];
       };
+      systemd.network.networks."${bridge}" = {
+        address = [ ip ];
+        gateway = [ gateway ];
+      };
       systemd.network.netdevs."${bridge}" = {
         enable = true;
         netdevConfig = {
@@ -24,13 +30,14 @@ let bridge = bridge: {mac, iface, ip}@_in: {
 {
   imports =
     [ # Include the results of the hardware scan.
-      ../types/k3s-server.nix
+      ../types/server.nix
     ];
   config = lib.mkMerge [
     (bridge "lan0" {
       mac = "d8:9e:f3:1b:7f:8a";
       iface = "phy0";
       ip = "172.16.1.251/12";
+      gateway = "172.16.1.1";
     })
   ];
 
diff --git a/types/server.nix b/types/server.nix
index 702c210..b0f8798 100644
--- a/types/server.nix
+++ b/types/server.nix
@@ -7,7 +7,6 @@
     ../modules/systemd-efi.nix
     ../modules/luks.nix
     ../modules/users.nix
-    ../modules/k3s.nix
   ];
   
   system.stateVersion = "24.05";