clean up wifi stuff a littleHEADmaster

1 files changed, 7 insertions, 39 deletions

diff --git a/router.nix b/router.nix
index 130feb1..efcc031 100644
--- a/router.nix
+++ b/router.nix
@@ -71,7 +71,6 @@ in
     };
     networks."20-wlan" = {
       matchConfig.Name = "wlan";
-      # vlan = [ "wlan-staff" "wlan-guest" ];
       networkConfig.Address = "10.69.1.1/24";
       networkConfig.LinkLocalAddressing = "no";
       linkConfig.RequiredForOnline = "routable";
@@ -107,32 +106,6 @@ in
         IPv4Forwarding = true;
       };
     };
-
-    # netdevs."10-vlan-staff" = {
-    #   netdevConfig = {
-    #     Kind = "vlan";
-    #     Name = "wlan-staff";
-    #   };
-    #   vlanConfig.Id = 10;
-    # };
-    # networks."30-vlan-staff" = {
-    #   matchConfig.Name = "wlan-staff";
-    #   networkConfig.Address = "10.69.1.1/24";
-    #   linkConfig.RequiredForOnline = "routable";
-    # };
-
-    # netdevs."10-vlan-guest" = {
-    #   netdevConfig = {
-    #     Kind = "vlan";
-    #     Name = "wlan-guest";
-    #   };
-    #   vlanConfig.Id = 20;
-    # };
-    # networks."30-vlan-guest" = {
-    #   matchConfig.Name = "wlan-guest";
-    #   networkConfig.Address = "10.69.2.1/24";
-    #   linkConfig.RequiredForOnline = "routable";
-    # };
   };
   services.resolved.enable = false;
 
@@ -170,13 +143,13 @@ in
       countryCode = "SE";
       band = "2g";
       channel = 11;
+
       networks.wlan = {
-        ssid = "Heidrun";
+        ssid = "Riksdagen";
         authentication = {
           mode = "wpa3-sae";
           saePasswords = [
-            { passwordFile = config.age.secrets."wifi-password-staff.txt".path; };
-            { passwordFile = config.age.secrets."wifi-password-guest.txt".path; }
+            { passwordFile = config.age.secrets."wifi-password.txt".path; }
           ];
         };
       };
@@ -201,18 +174,14 @@ in
       except-interface = "wan";
       dhcp-range = [
         "ethlan,10.69.0.50,10.69.0.254,255.255.255.0,1h"
-        "wlan-staff,10.69.1.2,10.69.1.254,255.255.255.0,1h"
-        "wlan-guest,10.69.2.2,10.69.2.254,255.255.255.0,1h"
+        "wlan,10.69.1.2,10.69.1.254,255.255.255.0,1h"
       ];
       dhcp-option = [
         "ethlan,option:router,10.69.0.1"
         "ethlan,option:dns-server,10.69.0.1"
 
-        "wlan-staff,option:router,10.69.1.1"
-        "wlan-staff,option:dns-server,10.69.1.1"
-
-        "wlan-guest,option:router,10.69.2.1"
-        "wlan-guest,option:dns-server,10.69.2.1"
+        "wlan,option:router,10.69.1.1"
+        "wlan,option:dns-server,10.69.1.1"
       ];
       dhcp-authoritative = true;
 
@@ -227,8 +196,7 @@ in
   };
   oden.persist.directories = [ "/var/lib/dnsmasq" ];
 
-  age.secrets."wifi-password-staff.txt".file = ./secrets/wifi-password-staff.txt.age;
-  age.secrets."wifi-password-guest.txt".file = ./secrets/wifi-password-guest.txt.age;
+  age.secrets."wifi-password.txt".file = ./secrets/wifi-password.txt.age;
   age.secrets."hcloud-token.txt".file = ./secrets/hcloud-token.txt.age;
   age.secrets."wg-key.txt" = {
     file = ./secrets/wg-key.txt;