From b2ec9599373c7e0f5428694c5712c8fc0be06264 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Thu, 14 Mar 2024 09:35:13 +0100
Subject: Load of updates and module simplification

---
 nixos/machine/adm-omnia.nix | 154 +++++++++++++++++++++-----------------------
 1 file changed, 73 insertions(+), 81 deletions(-)

(limited to 'nixos/machine/adm-omnia.nix')

diff --git a/nixos/machine/adm-omnia.nix b/nixos/machine/adm-omnia.nix
index 088481f..08db3fd 100644
--- a/nixos/machine/adm-omnia.nix
+++ b/nixos/machine/adm-omnia.nix
@@ -1,88 +1,80 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-with lib; {
-  config = {
-    cynerd = {
-      router = {
-        enable = true;
-        wan = "pppoe-wan";
-        lanIP = config.cynerd.hosts.adm.omnia;
-      };
-      wifiAP.adm = {
-        enable = true;
-        ar9287.interface = "wlp3s0";
-        qca988x.interface = "wlp2s0";
-      };
-      openvpn.oldpersonal = false;
-      monitoring.speedtest = true;
+{config, ...}: {
+  cynerd = {
+    router = {
+      enable = true;
+      wan = "pppoe-wan";
+      lanIP = config.cynerd.hosts.adm.omnia;
     };
+    wifiAP.adm = {
+      enable = true;
+      ar9287.interface = "wlp3s0";
+      qca988x.interface = "wlp2s0";
+    };
+    openvpn.oldpersonal = false;
+    monitoring.speedtest = true;
+  };
 
-    networking.useDHCP = false;
-    systemd.network = {
-      networks = {
-        "end2" = {
-          matchConfig.Name = "end2";
-          #networkConfig = {
-          #  DHCP = "ipv6";
-          #  IPv6AcceptRA = "yes";
-          #  DHCPPrefixDelegation = "yes";
-          #};
-          #dhcpPrefixDelegationConfig = {
-          #  UplinkInterface = ":self";
-          #  SubnetId = 0;
-          #  Announce = "no";
-          #};
-          linkConfig.RequiredForOnline = "routable";
-        };
-        "lan-brlan" = {
-          matchConfig.Name = "lan[1-4]";
-          networkConfig.Bridge = "brlan";
-          bridgeVLANs = [
-            {
-              bridgeVLANConfig = {
-                EgressUntagged = 1;
-                PVID = 1;
-              };
-            }
-            {bridgeVLANConfig.VLAN = 2;}
-          ];
-        };
-        "lan0-guest" = {
-          matchConfig.Name = "lan0";
-          networkConfig.Bridge = "brlan";
-          bridgeVLANs = [
-            {
-              bridgeVLANConfig = {
-                EgressUntagged = 2;
-                PVID = 2;
-              };
-            }
-          ];
-        };
+  networking.useDHCP = false;
+  systemd.network = {
+    networks = {
+      "end2" = {
+        matchConfig.Name = "end2";
+        #networkConfig = {
+        #  DHCP = "ipv6";
+        #  IPv6AcceptRA = "yes";
+        #  DHCPPrefixDelegation = "yes";
+        #};
+        #dhcpPrefixDelegationConfig = {
+        #  UplinkInterface = ":self";
+        #  SubnetId = 0;
+        #  Announce = "no";
+        #};
+        linkConfig.RequiredForOnline = "routable";
+      };
+      "lan-brlan" = {
+        matchConfig.Name = "lan[1-4]";
+        networkConfig.Bridge = "brlan";
+        bridgeVLANs = [
+          {
+            bridgeVLANConfig = {
+              EgressUntagged = 1;
+              PVID = 1;
+            };
+          }
+          {bridgeVLANConfig.VLAN = 2;}
+        ];
+      };
+      "lan0-guest" = {
+        matchConfig.Name = "lan0";
+        networkConfig.Bridge = "brlan";
+        bridgeVLANs = [
+          {
+            bridgeVLANConfig = {
+              EgressUntagged = 2;
+              PVID = 2;
+            };
+          }
+        ];
       };
     };
+  };
 
-    services.pppd = {
-      enable = true;
-      peers."wan".config = ''
-        plugin pppoe.so end2
-        ifname pppoe-wan
-        lcp-echo-interval 1
-        lcp-echo-failure 5
-        lcp-echo-adaptive
-        +ipv6
-        defaultroute
-        defaultroute6
-        usepeerdns
-        maxfail 1
-        user O2
-        password 02
-      '';
-    };
-    systemd.services."pppd-wan".after = ["sys-subsystem-net-devices-end2.device"];
+  services.pppd = {
+    enable = true;
+    peers."wan".config = ''
+      plugin pppoe.so end2
+      ifname pppoe-wan
+      lcp-echo-interval 1
+      lcp-echo-failure 5
+      lcp-echo-adaptive
+      +ipv6
+      defaultroute
+      defaultroute6
+      usepeerdns
+      maxfail 1
+      user O2
+      password 02
+    '';
   };
+  systemd.services."pppd-wan".after = ["sys-subsystem-net-devices-end2.device"];
 }
-- 
cgit v1.2.3