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/configurations/adm-omnia.nix  | 14 +++++---------
 nixos/configurations/adm-omnia2.nix |  8 +++-----
 nixos/configurations/spt-mox.nix    |  8 +++-----
 nixos/configurations/spt-mox2.nix   |  8 +++-----
 nixos/configurations/spt-omnia.nix  |  8 +++-----
 5 files changed, 17 insertions(+), 29 deletions(-)

(limited to 'nixos/configurations')

diff --git a/nixos/configurations/adm-omnia.nix b/nixos/configurations/adm-omnia.nix
index 672788a..dad595b 100644
--- a/nixos/configurations/adm-omnia.nix
+++ b/nixos/configurations/adm-omnia.nix
@@ -37,12 +37,10 @@
         networkConfig.Bridge = "brlan";
         bridgeVLANs = [
           {
-            bridgeVLANConfig = {
-              EgressUntagged = 1;
-              PVID = 1;
-            };
+            EgressUntagged = 1;
+            PVID = 1;
           }
-          {bridgeVLANConfig.VLAN = 2;}
+          {VLAN = 2;}
         ];
       };
       "lan0-guest" = {
@@ -50,10 +48,8 @@
         networkConfig.Bridge = "brlan";
         bridgeVLANs = [
           {
-            bridgeVLANConfig = {
-              EgressUntagged = 2;
-              PVID = 2;
-            };
+            EgressUntagged = 2;
+            PVID = 2;
           }
         ];
       };
diff --git a/nixos/configurations/adm-omnia2.nix b/nixos/configurations/adm-omnia2.nix
index 19ee446..2848bd9 100644
--- a/nixos/configurations/adm-omnia2.nix
+++ b/nixos/configurations/adm-omnia2.nix
@@ -45,12 +45,10 @@
       networkConfig.Bridge = "brlan";
       bridgeVLANs = [
         {
-          bridgeVLANConfig = {
-            EgressUntagged = 1;
-            PVID = 1;
-          };
+          EgressUntagged = 1;
+          PVID = 1;
         }
-        {bridgeVLANConfig.VLAN = 2;}
+        {VLAN = 2;}
       ];
     };
   };
diff --git a/nixos/configurations/spt-mox.nix b/nixos/configurations/spt-mox.nix
index 4e29bca..0bc7627 100644
--- a/nixos/configurations/spt-mox.nix
+++ b/nixos/configurations/spt-mox.nix
@@ -42,12 +42,10 @@
       networkConfig.Bridge = "brlan";
       bridgeVLANs = [
         {
-          bridgeVLANConfig = {
-            EgressUntagged = 1;
-            PVID = 1;
-          };
+          EgressUntagged = 1;
+          PVID = 1;
         }
-        {bridgeVLANConfig.VLAN = 2;}
+        {VLAN = 2;}
       ];
     };
   };
diff --git a/nixos/configurations/spt-mox2.nix b/nixos/configurations/spt-mox2.nix
index 9ffde96..085bb5f 100644
--- a/nixos/configurations/spt-mox2.nix
+++ b/nixos/configurations/spt-mox2.nix
@@ -41,12 +41,10 @@
       networkConfig.Bridge = "brlan";
       bridgeVLANs = [
         {
-          bridgeVLANConfig = {
-            EgressUntagged = 1;
-            PVID = 1;
-          };
+          EgressUntagged = 1;
+          PVID = 1;
         }
-        {bridgeVLANConfig.VLAN = 2;}
+        {VLAN = 2;}
       ];
     };
   };
diff --git a/nixos/configurations/spt-omnia.nix b/nixos/configurations/spt-omnia.nix
index e97f29f..29fe8c4 100644
--- a/nixos/configurations/spt-omnia.nix
+++ b/nixos/configurations/spt-omnia.nix
@@ -156,12 +156,10 @@ in {
         networkConfig.Bridge = "brlan";
         bridgeVLANs = [
           {
-            bridgeVLANConfig = {
-              EgressUntagged = 1;
-              PVID = 1;
-            };
+            EgressUntagged = 1;
+            PVID = 1;
           }
-          {bridgeVLANConfig.VLAN = 2;}
+          {VLAN = 2;}
         ];
       };
     };
-- 
cgit v1.2.3