nixos: update wifi WPA settings

The wpa option has changed and now serves to both disable as well as set
WPA version.

3 files changed, 21 insertions, 24 deletions

diff --git a/flake.lock b/flake.lock
index 2df7496..21c8f72 100644
--- a/flake.lock
+++ b/flake.lock
@@ -93,11 +93,11 @@
         "nixpkgs-regression": "nixpkgs-regression"
       },
       "locked": {
-        "lastModified": 1673443847,
-        "narHash": "sha256-w7+PgQmfM2y7hsoI1JJ1rWGLo1bNY3+CXE+rii9oT/8=",
+        "lastModified": 1674048395,
+        "narHash": "sha256-v1Mud0JhcemjfFfZJJr4miviET6DiwkBX2IAezvldNM=",
         "owner": "NixOS",
         "repo": "nix",
-        "rev": "6dd8b3b4122d9a4dccf17c00a290349a1509a7d6",
+        "rev": "ee1372d2467bba3f40fc849c4a5a9e1d782ee502",
         "type": "github"
       },
       "original": {
@@ -126,11 +126,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1673440569,
-        "narHash": "sha256-FQ5o0yI+MH9MgfseeGDsVIIpIqv3BCgq+0NzncuZ9Zo=",
+        "lastModified": 1673803274,
+        "narHash": "sha256-zaJDlHFXewT4KUsidMpRcPE+REymGH1Y3Eoc3Pjv4Xs=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "88016c96c3c338aa801695cdd9f186820bcfe4d6",
+        "rev": "7bd6b87b3712e68007823e8dd5c37ee9b114fee3",
         "type": "github"
       },
       "original": {
@@ -186,11 +186,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1673435251,
-        "narHash": "sha256-slcWQtwJBLprSvNODsH/CkpjV7Hx/ByMGkuGmBr65Bw=",
+        "lastModified": 1673954326,
+        "narHash": "sha256-oAKwsXTptcY6gRCBxJlZ+W1BrZHNr9a28+4fQMLuRu0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0abc5480edcab69f26e1bdd5f7ee82890cfe273f",
+        "rev": "8fc3a1dcc98d3603221d4afd239e666eeedb6141",
         "type": "github"
       },
       "original": {
@@ -251,11 +251,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1673306963,
-        "narHash": "sha256-1ClBFSoPX1M2pnUTnfOAeikYPZM2nH5NMgCttR3xhSk=",
+        "lastModified": 1673981871,
+        "narHash": "sha256-2PM+UojDHK0CV8m5oKAdumKSImOwcW8qNf81iY4IEbA=",
         "owner": "cynerd",
         "repo": "nixturris",
-        "rev": "4c28c4f0bfe6fb842a7c2f1906fb4e85d359067a",
+        "rev": "ebe1b615dbd982f6eaf179f09ae3d0e34e184747",
         "type": "github"
       },
       "original": {
@@ -266,11 +266,11 @@
     },
     "personal-secret": {
       "locked": {
-        "lastModified": 1673115364,
-        "narHash": "sha256-Iycxa2kd3O3SCjkbosTr70t3CtKrxqaGNYEqBrOAY54=",
+        "lastModified": 1673965615,
+        "narHash": "sha256-zTdEymT6KUtiM/yvmb3v7lBBbWKF/6NWDpN2z9qMdBc=",
         "ref": "refs/heads/master",
-        "rev": "bbed897a2c4b851790425ca193957191654350e3",
-        "revCount": 54,
+        "rev": "4af47d275942e9d55c2859badea481264d5529f1",
+        "revCount": 61,
         "type": "git",
         "url": "ssh://git@cynerd.cz/nixos-personal-secret"
       },
@@ -353,11 +353,11 @@
     },
     "vpsadminos": {
       "locked": {
-        "lastModified": 1673446945,
-        "narHash": "sha256-cug4YVF08jucDrZn23gv/Buo4FwhAUgW1AtTwQ0Dvas=",
+        "lastModified": 1673860594,
+        "narHash": "sha256-P9d6EP8ej4/mlCBwjf4SN+dv4/szU1r1OoF8Te8dwL4=",
         "owner": "vpsfreecz",
         "repo": "vpsadminos",
-        "rev": "a500b37644ab51652087272a864eaa87e6fc3e5d",
+        "rev": "f3581a453258c0da305ec57b70eb22af78400ab8",
         "type": "github"
       },
       "original": {
diff --git a/nixos/machine/spt-mox.nix b/nixos/machine/spt-mox.nix
index d79da46..84029c6 100644
--- a/nixos/machine/spt-mox.nix
+++ b/nixos/machine/spt-mox.nix
@@ -20,11 +20,9 @@ with lib; {
           ht_capab = ["HT40+" "SHORT-GI-20" "SHORT-GI-40" "TX-STBC" "RX-STBC1" "DSSS_CCK-40"];
           ssid = "TurrisRules";
           bridge = "brlan";
-          wpa = true;
-          wpa3 = false;
+          wpa = 2;
           wpaPassphrase = "@PASS_TURRIS_RULES@";
         };
-        # TODO use use wlp3s0 with 80211ax
       };
     };
 
diff --git a/nixos/machine/spt-mox2.nix b/nixos/machine/spt-mox2.nix
index 68cba29..b504563 100644
--- a/nixos/machine/spt-mox2.nix
+++ b/nixos/machine/spt-mox2.nix
@@ -24,8 +24,7 @@ with lib; {
           ht_capab = ["LDPC" "HT40+" "SHORT-GI-20" "SHORT-GI-40" "TX-STBC" "RX-STBC1" "MAX-AMSDU-7935" "DSSS_CCK-40"];
           ssid = "TurrisRules";
           bridge = "brlan";
-          wpa = true;
-          wpa3 = false;
+          wpa = 2;
           wpaPassphrase = "@PASS_TURRIS_RULES@";
           #bss = {
           #  "wlp1s0host" = {