1 files changed, 37 insertions, 33 deletions

diff --git a/nixos/configurations/zd-one0.nix b/nixos/configurations/zd-one0.nix
index 98d9691..dc261cd 100644
--- a/nixos/configurations/zd-one0.nix
+++ b/nixos/configurations/zd-one0.nix
@@ -1,34 +1,38 @@
-_: {
+{config, ...}: {
   system.stateVersion = "25.11";
   deploy = {
     enable = true;
-    ssh.host = "zd-one0";
+    #ssh.host = "zd-one0";
+    ssh.host = "one0nix";
   };
 
   cynerd = {
     openwrtone = true;
-    #switch = {
-    #  enable = true;
-    #  lanAddress = "10.8.12.10/24";
-    #  lanGateway = config.cynerd.hosts.spt.omnia;
-    #};
-    #wifiAP.zd = {
-    #  enable = false;
-    #  qca988x = {
-    #    interface = "wlp1s0";
-    #    bssids = config.secrets.wifiMacs.zd-mox.qca988x;
-    #    channel = 36;
-    #  };
-    #};
+    switch = {
+      enable = true;
+      lanAddress = "${config.cynerd.hosts.zd.one0nix}/24";
+      lanGateway = config.cynerd.hosts.zd.mox;
+    };
+    wifiAP.zd = {
+      enable = false;
+      wlan0 = {
+        bssids = [
+          "20:05:b7:00:4c:02"
+          "20:05:b7:04:4c:02"
+          "20:05:b7:08:4c:02"
+        ];
+        channel = 7;
+      };
+    };
   };
 
   boot.initrd.availableKernelModules = ["dm-mod"];
   boot.consoleLogLevel = 7;
 
   services = {
-    journald.extraConfig = ''
-      SystemMaxUse=8G
-    '';
+    journald.settings.Journal = {
+      SystemMaxUse = "32G";
+    };
 
     btrfs.autoScrub = {
       enable = true;
@@ -41,21 +45,21 @@ _: {
     };
   };
 
-  networking.useDHCP = false;
-  networking.useNetworkd = true;
-
-  systemd.network = {
-    networks = {
-      "eth0" = {
-        matchConfig.Name = "eth0";
-        networkConfig = {
-          Address = "10.8.2.10/24";
-          Gateway = "10.8.2.1";
-          DNS = "1.1.1.1";
-          IPv6AcceptRA = "yes";
-        };
-      };
+  networking = {
+    useNetworkd = true;
+    useDHCP = false;
+  };
+  systemd.network.networks = {
+    "lan-brlan" = {
+      matchConfig.Name = "end*";
+      networkConfig.Bridge = "brlan";
+      bridgeVLANs = [
+        {
+          EgressUntagged = 1;
+          PVID = 1;
+        }
+        {VLAN = 2;}
+      ];
     };
-    wait-online.anyInterface = true;
   };
 }