1 files changed, 34 insertions, 11 deletions

diff --git a/nixos/machine/adm-omnia.nix b/nixos/machine/adm-omnia.nix
index c704b58..96e936f 100644
--- a/nixos/machine/adm-omnia.nix
+++ b/nixos/machine/adm-omnia.nix
@@ -9,12 +9,31 @@ with lib; {
     cynerd = {
       router = {
         enable = true;
-        wan = "end2";
+        wan = "end2"; # TODO pppoe-wan
         lanIP = config.cynerd.hosts.adm.omnia;
       };
       openvpn.oldpersonal = false;
     };
 
+    # TODO pppd service requires end2 interface
+    services.pppd = {
+      enable = false;
+      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
+      '';
+    };
+
     networking.bridges = {
       brlan.interfaces = ["lan0" "lan1" "lan2" "lan3" "lan4"];
     };
@@ -23,23 +42,27 @@ with lib; {
       enable = true;
       environmentFile = "/run/secrets/hostapd.env";
       interfaces = {
-        "wlp1s0" = {
+        "wlp2s0" = {
           countryCode = "CZ";
           hwMode = "a";
           channel = 36;
           ieee80211ac = true;
           ht_capab = ["HT40+" "LDPC" "SHORT-GI-20" "SHORT-GI-40" "TX-STBC" "RX-STBC1" "MAX-AMSDU-7935" "DSSS_CCK-40"];
           vht_capab = ["RXLDPC" "SHORT-GI-80" "TX-STBC-2BY1" "RX-ANTENNA-PATTERN" "TX-ANTENNA-PATTERN" "RX-STBC-1" "MAX-MPDU-11454" "MAX-A-MPDU-LEN-EXP7"];
-          ssid = "TurrisRules5";
+          ssid = "TurrisAdamkovi5";
+          wpa = 2;
+          wpaPassphrase = "@PASS_TURRIS_ADAMKOVI@";
+          bridge = "brlan";
+        };
+        "wlp3s0" = {
+          countryCode = "CZ";
+          hwMode = "g";
+          channel = 7;
+          ht_capab = ["HT40+" "SHORT-GI-20" "SHORT-GI-40" "TX-STBC" "RX-STBC1" "DSSS_CCK-40"];
+          ssid = "TurrisAdamkovi";
           wpa = 2;
-          wpaPassphrase = "@PASS_TURRIS_RULES@";
-          bss = {
-            "wlp1s0host" = {
-              ssid = "KocoviGuest";
-              wpa = 2;
-              wpaPassphrase = "@PASS_KOCOVI@";
-            };
-          };
+          wpaPassphrase = "@PASS_TURRIS_ADAMKOVI@";
+          bridge = "brlan";
         };
       };
     };