Desktop/networkManager: refactor

lib/default.nix

@@ -4,5 +4,6 @@ nixpkgs.lib.extend (final: prev: {
     importLib = file: import file {lib = final;};
   in {
     patches = importLib ./patches.nix;
+    networkManager = importLib ./networkManager.nix;
   };
 })

lib/networkManager.nix

@@ -0,0 +1,18 @@
+{lib}: {
+	/**
+  Make a NetworkManager wifi profile, to be used with ensureProfiles
+	*/
+	mkWifiProfile = {id, ssid, priority ? 0,  wifi-security}: {
+	  connection = {
+	    inherit id;
+	    type = "wifi";
+	    autoconnect-priority = priority;
+	  };
+	  ipv4.method = "auto";
+	  wifi = {
+	    mode = "infrastructure";
+	    inherit ssid;
+	  };
+	  inherit wifi-security;
+	};
+}

roles/desktop/services/networkmanager.nix

@@ -1,5 +1,6 @@
 {
   config,
+  lib,
   flakeSelf,
   ...
 }: let
@@ -16,35 +17,21 @@ in {
     ];
     ensureProfiles = {
       environmentFiles = [config.sops.secrets.wifiPasswords.path];
-      profiles = {
+      profiles = with lib.toast.networkManager; {
-        "4g-modem" = {
+        "4g-modem" = mkWifiProfile {
-          connection = {
+          id = "4G Modem";
-            id = "4G Modem";
+          priority = 5;
-            type = "wifi";
+          ssid = "TP-Link_CCB4";
-            autoconnect-priority = 5;
-          };
-          ipv4.method = "auto";
-          wifi = {
-            mode = "infrastructure";
-            ssid = "TP-Link_CCB4";
-          };
           wifi-security = {
             auth-alg = "open";
             key-mgmt = "wpa-psk";
             psk = "$MODEM";
           };
         };
-        phone = {
+        phone = mkWifiProfile {
-          connection = {
+          id = "Phone";
-            id = "Phone";
+          priority = 5;
-            type = "wifi";
+          ssid = "Redmi Note 10 Pro_5197";
-            autoconnect-priority = 5;
-          };
-          ipv4.method = "auto";
-          wifi = {
-            mode = "infrastructure";
-            ssid = "Redmi Note 10 Pro_5197";
-          };
           wifi-security = {
             auth-alg = "open";
             key-mgmt = "sae";