From 3b4f67c04f26aa9b488ffed7023f60e9cea859d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20K=C3=A4nner?= <max.kaenner@gmail.com>
Date: Mon, 18 Mar 2024 10:34:42 +0100
Subject: [PATCH] 242 current  1970-01-01 01:00:00  24.05.20240316.c75037b 
 6.6.22                          *

---
 modules/nixos/sops.nix | 15 ++++++++
 modules/nixos/wifi.nix | 83 +++++++++++++++++++++++++-----------------
 2 files changed, 65 insertions(+), 33 deletions(-)

diff --git a/modules/nixos/sops.nix b/modules/nixos/sops.nix
index 6e14a83..90b9e80 100644
--- a/modules/nixos/sops.nix
+++ b/modules/nixos/sops.nix
@@ -8,12 +8,27 @@
       "home/psk" = {
         sopsFile = ../../secrets/wifi.yaml;
       };
+      "parents/ssid" = {
+        sopsFile = ../../secrets/wifi.yaml;
+      };
+      "parents/psk" = {
+        sopsFile = ../../secrets/wifi.yaml;
+      };
       "eduroam/ident" = {
         sopsFile = ../../secrets/wifi.yaml;
       };
       "eduroam/psk" = {
         sopsFile = ../../secrets/wifi.yaml;
       };
+      "luhbots/ssid" = {
+        sopsFile = ../../secrets/wifi.yaml;
+      };
+      "luhbots/ssid5" = {
+        sopsFile = ../../secrets/wifi.yaml;
+      };
+      "luhbots/psk" = {
+        sopsFile = ../../secrets/wifi.yaml;
+      };
     };
   };
 }
diff --git a/modules/nixos/wifi.nix b/modules/nixos/wifi.nix
index 54ae9d5..7995e60 100644
--- a/modules/nixos/wifi.nix
+++ b/modules/nixos/wifi.nix
@@ -10,6 +10,7 @@
       [connection]
       id=${placeholder."home/ssid"}
       type=wifi
+      autoconnect-priority=10
 
       [wifi]
       mode=infrastructure
@@ -19,10 +20,25 @@
       key-mgmt=wpa-psk
       psk=${placeholder."home/psk"}
     '';
+    "parents.nmconnection".content = ''
+      [connection]
+      id=${placeholder."parents/ssid"}
+      type=wifi
+      autoconnect-priority=10
+
+      [wifi]
+      mode=infrastructure
+      ssid=${placeholder."parents/ssid"}
+
+      [wifi-security]
+      key-mgmt=wpa-psk
+      psk=${placeholder."parents/psk"}
+    '';
     "eduroam.nmconnection".content = ''
       [connection]
       id=eduroam
       type=wifi
+      autoconnect-priority=0
 
       [wifi]
       mode=infrastructure
@@ -41,47 +57,48 @@
       password=${placeholder."eduroam/psk"}
       phase2-auth=mschapv2
     '';
+    "luhbots.nmconnection".content = ''
+      [connection]
+      id=${placeholder."luhbots/ssid"}
+      type=wifi
+      autoconnect-priority=5
+
+      [wifi]
+      mode=infrastructure
+      ssid=${placeholder."luhbots/ssid"}
+      autoconnect-priority=0
+
+      [wifi-security]
+      key-mgmt=wpa-psk
+      psk=${placeholder."luhbots/psk"}
+    '';
+    "luhbots5.nmconnection".content = ''
+      [connection]
+      id=${placeholder."luhbots/ssid5"}
+      type=wifi
+      autoconnect-priority=10
+
+      [wifi]
+      mode=infrastructure
+      ssid=${placeholder."luhbots/ssid5"}
+      autoconnect-priority=0
+
+      [wifi-security]
+      key-mgmt=wpa-psk
+      psk=${placeholder."luhbots/psk"}
+    '';
   };
   environment.etc = let
     template = config.sops.templates;
     base = "NetworkManager/system-connections";
   in {
     "${base}/home.nmconnection".source = template."home.nmconnection".path;
+    "${base}/parents.nmconnection".source = template."parents.nmconnection".path;
     "${base}/eduroam.nmconnection".source = template."eduroam.nmconnection".path;
+    "${base}/luhbots.nmconnection".source = template."luhbots.nmconnection".path;
+    "${base}/luhbots5.nmconnection".source = template."luhbots5.nmconnection".path;
   };
-  networking.networkmanager = {
-    enable = true;
-    ensureProfiles.profiles = {
-      luhbotsNet5 = {
-        connection = {
-          id = "luhbotsNet5";
-          type = "wifi";
-          autoconnect-priority = "10";
-        };
-        wifi = {
-          mode = "infrastructure";
-          ssid = "luhbotsNet5";
-        };
-        wifi-security = {
-          key-mgmt = "wpa-psk";
-        };
-      };
-      luhbotsNet = {
-        connection = {
-          id = "luhbotsNet";
-          type = "wifi";
-          autoconnect-priority = "5";
-        };
-        wifi = {
-          mode = "infrastructure";
-          ssid = "luhbotsNet";
-        };
-        wifi-security = {
-          key-mgmt = "wpa-psk";
-        };
-      };
-    };
-  };
+  networking.networkmanager.enable = true;
 
   environment.systemPackages = with pkgs; [
     nm-tray