From 993a2c5512f7757c45d7ff802065b899cb898b0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Thu, 6 Jun 2024 22:11:50 +0200
Subject: Update and change configuration to fix warnings

---
 nixos/modules/develop.nix  |  1 +
 nixos/modules/router.nix   | 10 ++++------
 nixos/modules/switch.nix   |  6 ++----
 nixos/modules/wifi-adm.nix | 36 ++++++++++++------------------------
 nixos/modules/wifi-spt.nix | 16 ++++------------
 5 files changed, 23 insertions(+), 46 deletions(-)

(limited to 'nixos/modules')

diff --git a/nixos/modules/develop.nix b/nixos/modules/develop.nix
index 9fb7d12..2a20527 100644
--- a/nixos/modules/develop.nix
+++ b/nixos/modules/develop.nix
@@ -77,6 +77,7 @@ in {
           mypy
 
           scipy
+          statsmodels
           sympy
 
           pygraphviz
diff --git a/nixos/modules/router.nix b/nixos/modules/router.nix
index c8b1283..a658515 100644
--- a/nixos/modules/router.nix
+++ b/nixos/modules/router.nix
@@ -98,8 +98,8 @@ in {
           matchConfig.Name = "brlan";
           networkConfig.VLAN = ["home" "guest"];
           bridgeVLANs = [
-            {bridgeVLANConfig.VLAN = 1;}
-            {bridgeVLANConfig.VLAN = 2;}
+            {VLAN = 1;}
+            {VLAN = 2;}
           ];
         };
         "home" = {
@@ -121,10 +121,8 @@ in {
           };
           dhcpServerStaticLeases =
             mapAttrsToList (n: v: {
-              dhcpServerStaticLeaseConfig = {
-                MACAddress = n;
-                Address = v;
-              };
+              MACAddress = n;
+              Address = v;
             })
             cnf.staticLeases;
           dhcpPrefixDelegationConfig = {
diff --git a/nixos/modules/switch.nix b/nixos/modules/switch.nix
index 37ac687..e74102a 100644
--- a/nixos/modules/switch.nix
+++ b/nixos/modules/switch.nix
@@ -42,10 +42,8 @@ in {
           matchConfig.Name = "brlan";
           bridgeVLANs = [
             {
-              bridgeVLANConfig = {
-                PVID = 1;
-                EgressUntagged = 1;
-              };
+              PVID = 1;
+              EgressUntagged = 1;
             }
           ];
           networkConfig = {
diff --git a/nixos/modules/wifi-adm.nix b/nixos/modules/wifi-adm.nix
index 40210e7..1db730c 100644
--- a/nixos/modules/wifi-adm.nix
+++ b/nixos/modules/wifi-adm.nix
@@ -117,10 +117,8 @@ in {
         networkConfig.Bridge = "brlan";
         bridgeVLANs = [
           {
-            bridgeVLANConfig = {
-              EgressUntagged = 1;
-              PVID = 1;
-            };
+            EgressUntagged = 1;
+            PVID = 1;
           }
         ];
       };
@@ -129,10 +127,8 @@ in {
         networkConfig.Bridge = "brlan";
         bridgeVLANs = [
           {
-            bridgeVLANConfig = {
-              EgressUntagged = 2;
-              PVID = 2;
-            };
+            EgressUntagged = 2;
+            PVID = 2;
           }
         ];
       };
@@ -141,10 +137,8 @@ in {
         networkConfig.Bridge = "brlan";
         bridgeVLANs = [
           {
-            bridgeVLANConfig = {
-              EgressUntagged = 2;
-              PVID = 2;
-            };
+            EgressUntagged = 2;
+            PVID = 2;
           }
         ];
       };
@@ -153,10 +147,8 @@ in {
         networkConfig.Bridge = "brlan";
         bridgeVLANs = [
           {
-            bridgeVLANConfig = {
-              EgressUntagged = 1;
-              PVID = 1;
-            };
+            EgressUntagged = 1;
+            PVID = 1;
           }
         ];
       };
@@ -165,10 +157,8 @@ in {
         networkConfig.Bridge = "brlan";
         bridgeVLANs = [
           {
-            bridgeVLANConfig = {
-              EgressUntagged = 2;
-              PVID = 2;
-            };
+            EgressUntagged = 2;
+            PVID = 2;
           }
         ];
       };
@@ -177,10 +167,8 @@ in {
         networkConfig.Bridge = "brlan";
         bridgeVLANs = [
           {
-            bridgeVLANConfig = {
-              EgressUntagged = 2;
-              PVID = 2;
-            };
+            EgressUntagged = 2;
+            PVID = 2;
           }
         ];
       };
diff --git a/nixos/modules/wifi-spt.nix b/nixos/modules/wifi-spt.nix
index 669439d..2ecc3a3 100644
--- a/nixos/modules/wifi-spt.nix
+++ b/nixos/modules/wifi-spt.nix
@@ -130,10 +130,8 @@ in {
           networkConfig.Bridge = "brlan";
           bridgeVLANs = [
             {
-              bridgeVLANConfig = {
-                EgressUntagged = 1;
-                PVID = 1;
-              };
+              EgressUntagged = 1;
+              PVID = 1;
             }
           ];
         };
@@ -142,10 +140,8 @@ in {
         #  networkConfig.Bridge = "brlan";
         #  bridgeVLANs = [
         #    {
-        #      bridgeVLANConfig = {
         #        EgressUntagged = 2;
         #        PVID = 2;
-        #      };
         #    }
         #  ];
         #};
@@ -159,10 +155,8 @@ in {
           networkConfig.Bridge = "brlan";
           bridgeVLANs = [
             {
-              bridgeVLANConfig = {
-                EgressUntagged = 1;
-                PVID = 1;
-              };
+              EgressUntagged = 1;
+              PVID = 1;
             }
           ];
         };
@@ -171,10 +165,8 @@ in {
         #  networkConfig.Bridge = "brlan";
         #  bridgeVLANs = [
         #    {
-        #      bridgeVLANConfig = {
         #        EgressUntagged = 2;
         #        PVID = 2;
-        #      };
         #    }
         #  ];
         #};
-- 
cgit v1.2.3