clean up wifi stuff a littleHEADmaster

5 files changed, 20 insertions, 63 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;
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 327112f..ebf8801 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -7,8 +7,7 @@ let
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPC69ml72mqbn7L3QkpsCJuWdrKFYFNd0MaS5xERbuSF" # ymer
   ];
   files = [
-    "wifi-password-staff.txt.age"
-    "wifi-password-guest.txt.age"
+    "wifi-password.txt.age"
     "password-hash.txt.age"
     "hcloud-token.txt.age"
     "wg-key.txt"
diff --git a/secrets/wifi-password-guest.txt.age b/secrets/wifi-password-guest.txt.age
deleted file mode 100644
index 3686972..0000000
--- a/secrets/wifi-password-guest.txt.age
+++ /dev/null
@@ -1,11 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 rf0kpA e+dQN41upKZWrlwpfmY8+VK6Qs4hHNFdQerinuX5eyU
-hoJVoGWfCkpBZr0x2NImrdtw3KrSUXnYZfuXcpI+kOY
--> piv-p256 Ddzw4A A9gD9rq8ObVyF/KBEMwW8mFabAtjVWzfPmM7Ksj2ztRl
-zgw5MAIEjfTRmz9wj8Al3kpkI71/WqbhAmClsmbVsV8
--> piv-p256 9aSbLw AiUY0bAv27M+cS2MgYUxIph/AyfW4bogD2OI+9JuCcVc
-hwsgy+bcNakZsrOPkkMeAGchvjAAKC8fXFKVl8ag3MY
--> ssh-ed25519 YS7/yg ORMw5ZoDjmU/7XKyD6e48xWx0p1CrIMigO6YhxVCWWM
-rl0Yfa1ewsDDAYXZptgT2RewKzOuN6XWrA8c6iFt5rk
---- zrhMxK0oJR05YG+Ve36jgO5kNdwCI4mhUrZZXi/CmHE
-U;�5��FP�`�!@L�JP��b]���Lc�U��tf'%�]!Eػ�iW!Lm�da�5�ޘ,��
\ No newline at end of file
diff --git a/secrets/wifi-password-staff.txt.age b/secrets/wifi-password-staff.txt.age
deleted file mode 100644
index 97874ac..0000000
--- a/secrets/wifi-password-staff.txt.age
+++ /dev/null
@@ -1,11 +0,0 @@
-age-encryption.org/v1
--> ssh-ed25519 rf0kpA ZRfFZC4N5Jdnc32fZiL0QkXth2Lm1AuvGBW2PaFS/Dk
-RxOiUlv8wkWggGrRB0tokIyZIno+4Yxk/kf9FxpKqZ8
--> piv-p256 Ddzw4A AwOuo9hts6Yz0cm878aHI6rwFyXNT1dHOiYsvloVA+2E
-GolNszVMq4xdHm0HIrAWVGhHwmSySkYbaA2+BVEhvGw
--> piv-p256 9aSbLw Ay35UlB8/sD2b92X/AQ47MZG5FmEh8BaaNpAYm6Ousb4
-ctMzgWfXczvfQFBNTeFau4E6LlrKiDma5JN3T48WYMU
--> ssh-ed25519 YS7/yg pxaaPWZcrAv8B11T+h/v9CE4xzb/VglRPRJbAthA6lU
-/Ye6TnDB+49l7REHzxBN4jPbOIfLevdadIrt7S20ZIU
---- fi9+1UaXfza/crt3fD64sPAxIqlTB9uI4/hgjGS1gdM
-
�5ҡV����c�(���Ϗ�eL�s30������:6j�9�Ѕ��h+�m�A���O�
\ No newline at end of file
diff --git a/secrets/wifi-password.txt.age b/secrets/wifi-password.txt.age
new file mode 100644
index 0000000..3b82240
--- /dev/null
+++ b/secrets/wifi-password.txt.age
@@ -0,0 +1,12 @@
+age-encryption.org/v1
+-> ssh-ed25519 rf0kpA fEYNUAtkV6M9r+t+cadTnNP1QSr3sejvqRcBv61VAio
+w+VAj6SG9MF5PGxW+rAuAL6EL3HrLE81CCKYMUQ6jg4
+-> piv-p256 Ddzw4A AkyXvsMdMyDoaC31XYJ9a9m3l4LNHLY8mfce4JoQ/wWb
+LEe9nt468R++vSBb/MKiOEZVahWszHPgSIkUBir30OQ
+-> piv-p256 9aSbLw As7nLtEWQsIuGu02oQaokeH2H+5o1+b9FQPp9w/9mqpH
+eYCfvjdhvgHlOb4YEAXdsS6CuDkChXBK20sTHZrF9Jg
+-> ssh-ed25519 YS7/yg yOIhzBI7VravND8W94p8ItEkdSGX+sFt5eGo8jt7aFM
+uNuR+OGU4zANUPevIZ0pjXLalAUWObfCw5jOCFau9rs
+--- f2oOyHOXpdIGdKCkpYZI/x9i5Teg+qY3sK+tyoi7z0s
+%�
+$�J���y!����U?�*GXL<_O?@^wԏ
��
h�̤�j��X�=�;^�N���?���#[��O��'�ŏ�*
\ No newline at end of file