From 9f83338d6d90740f9972f12a5c52cdbce4c90fd5 Mon Sep 17 00:00:00 2001
From: Kabbone <tobias@opel-online.de>
Date: Sat, 28 Jan 2023 17:40:29 +0100
Subject: [PATCH] hosts: working vswitch with vlans

---
 hosts/desktop/hardware-configuration.nix | 46 ++++++++++++++++--------
 hosts/nas/hardware-configuration.nix     | 21 ++++++++---
 2 files changed, 48 insertions(+), 19 deletions(-)

diff --git a/hosts/desktop/hardware-configuration.nix b/hosts/desktop/hardware-configuration.nix
index af9081a..3d75e4e 100644
--- a/hosts/desktop/hardware-configuration.nix
+++ b/hosts/desktop/hardware-configuration.nix
@@ -109,8 +109,27 @@
   swapDevices = [ ];
   
   networking = {
+    vswitches = {
+        vs0 = {
+            interfaces = {
+                enp34s0 = {  };
+                lo1 = {
+                    type = "internal";
+                };
+                enp34s0iot = {
+                    type = "internal";
+                    vlan = 100;
+                };
+            };
+      #      extraOvsctlCmds = ''
+      #          set port enp34s0 vlan_mode=native-tagged
+      #          set port enp34s0 trunks=1,100
+      #          set port enp34s0 tag=1
+      #      '';
+        };
+    };
     useDHCP = false;                        # Deprecated
-    hostName = "nas";
+    hostName = "hades";
     domain = "home.opel-online.de";
     networkmanager = {
       enable = true;
@@ -118,25 +137,22 @@
     timeServers = [
         "192.168.2.1"
     ];
-    vlans = {
-        vlan100 = {
-            id = 100;
-            interface = "enp34s0";
-        };
-    };
     interfaces = {
-      enp34s0 = {
-        useDHCP = true;                     # For versatility sake, manually edit IP on nm-applet.
-        #ipv4.addresses = [ {
-        #    address = "192.168.0.51";
-        #    prefixLength = 24;
-        #} ];
-      };
+      #enp34s0 = {
+      #  useDHCP = true;                     # For versatility sake, manually edit IP on nm-applet.
+      #  #ipv4.addresses = [ {
+      #  #    address = "192.168.0.51";
+      #  #    prefixLength = 24;
+      #  #} ];
+      #};
+      #enp34s0iot.useDHCP = true;
+      lo1.useDHCP = true;
     };
     #defaultGateway = "192.168.0.1";
     defaultGateway6 = {
       address = "fe80::1";
-      interface = "enp34s0";
+      #interface = "enp34s0";
+      interface = "lo1";
     };
     #nameservers = [ "192.168.0.4" ];
     #firewall = {
diff --git a/hosts/nas/hardware-configuration.nix b/hosts/nas/hardware-configuration.nix
index c1ab5af..358e9bf 100644
--- a/hosts/nas/hardware-configuration.nix
+++ b/hosts/nas/hardware-configuration.nix
@@ -101,7 +101,6 @@
       };
   };
 
-
   fileSystems."/" =
     { device = "/dev/disk/by-label/NIXROOT";
       fsType = "btrfs";
@@ -174,6 +173,18 @@
   swapDevices = [ ];
   
   networking = {
+    vswitches = {
+        vs0 = {
+            interfaces = {
+                enp0s31f6 = {  };
+                lo1 = {
+                    type = "internal";
+                };
+                enp0s31f6iot = {
+                    type = "internal";
+                    vlan = 100;
+                };
+            };
     useDHCP = false;                        # Deprecated
     hostName = "nas";
     domain = "home.opel-online.de";
@@ -190,8 +201,8 @@
         };
     };
     interfaces = {
-      enp0s31f6 = {
-        useDHCP = true;                     # For versatility sake, manually edit IP on nm-applet.
+#      enp0s31f6 = {
+#        useDHCP = true;                     # For versatility sake, manually edit IP on nm-applet.
 #        ipv4.addresses = [ {
 #            address = "45.142.114.153";
 #            prefixLength = 24;
@@ -201,11 +212,13 @@
 #            prefixLength = 64;
 #        } ];
       };
+      lo1.useDHCP = true;
     };
 #    defaultGateway = "45.142.114.1";
     defaultGateway6 = {
       address = "fe80::1";
-      interface = "enp0s31f6";
+      #interface = "enp0s31f6";
+      interface = "lo1";
     };
 #    nameservers = [ "9.9.9.9" "2620:fe::fe" ];
     #firewall = {