deprecate iwd module gracefully

clanModules/iwd/roles/default.nix

@@ -33,70 +33,80 @@ let
       };
   };
 in
-{
-  options.clan.iwd = {
-    networks = lib.mkOption {
-      type = lib.types.attrsOf (
-        lib.types.submodule (
-          { name, ... }:
-          {
-            options = {
-              ssid = lib.mkOption {
-                type = lib.types.str;
-                default = name;
-                description = "The name of the wifi network";
+lib.warn
+  ''
+    The clan module `iwd` is deprecated and replaced by the clans service `wifi`
+    Please migrate your config to the new service (see: https://docs.clan.lol/reference/clanServices/wifi/)
+
+    To keep passwords after migrating the config, use:
+      clan vars get <your-machine> iwd.<network-name>/ssid | clan vars set <your-machine> wifi.<network-name>/network-name
+    and:
+      clan vars get <your-machine> iwd.<network-name>/password | clan vars set <your-machine> wifi.<network-name>/password
+  ''
+  {
+    options.clan.iwd = {
+      networks = lib.mkOption {
+        type = lib.types.attrsOf (
+          lib.types.submodule (
+            { name, ... }:
+            {
+              options = {
+                ssid = lib.mkOption {
+                  type = lib.types.str;
+                  default = name;
+                  description = "The name of the wifi network";
+                };
+                AutoConnect = lib.mkOption {
+                  type = lib.types.bool;
+                  default = true;
+                  description = "Automatically try to join this wifi network";
+                };
               };
-              AutoConnect = lib.mkOption {
-                type = lib.types.bool;
-                default = true;
-                description = "Automatically try to join this wifi network";
-              };
-            };
-          }
-        )
-      );
-      default = { };
-      description = "Wifi networks to predefine";
-    };
-  };
-
-  imports = [
-    (lib.mkRemovedOptionModule [
-      "clan"
-      "iwd"
-      "enable"
-    ] "Just define clan.iwd.networks to enable it")
-  ];
-
-  config = lib.mkMerge [
-    (lib.mkIf (cfg.networks != { }) {
-      # Systemd tmpfiles rule to create /var/lib/iwd/example.psk file
-      systemd.tmpfiles.rules = lib.mapAttrsToList (
-        _: value: "C /var/lib/iwd/${value.ssid}.psk 0600 root root - ${secret_path value.ssid}"
-      ) cfg.networks;
-
-      clan.core.vars.generators = lib.mapAttrs' secret_generator cfg.networks;
-
-      # TODO: restart the iwd.service if something changes
-    })
-    {
-      # disable wpa supplicant
-      networking.wireless.enable = false;
-
-      # Set the network manager backend to iwd
-      networking.networkmanager.wifi.backend = "iwd";
-
-      # Use iwd instead of wpa_supplicant. It has a user friendly CLI
-      networking.wireless.iwd = {
-        enable = true;
-        settings = {
-          Network = {
-            EnableIPv6 = true;
-            RoutePriorityOffset = 300;
-          };
-          Settings.AutoConnect = true;
-        };
+            }
+          )
+        );
+        default = { };
+        description = "Wifi networks to predefine";
       };
-    }
-  ];
-}
+    };
+
+    imports = [
+      (lib.mkRemovedOptionModule [
+        "clan"
+        "iwd"
+        "enable"
+      ] "Just define clan.iwd.networks to enable it")
+    ];
+
+    config = lib.mkMerge [
+      (lib.mkIf (cfg.networks != { }) {
+        # Systemd tmpfiles rule to create /var/lib/iwd/example.psk file
+        systemd.tmpfiles.rules = lib.mapAttrsToList (
+          _: value: "C /var/lib/iwd/${value.ssid}.psk 0600 root root - ${secret_path value.ssid}"
+        ) cfg.networks;
+
+        clan.core.vars.generators = lib.mapAttrs' secret_generator cfg.networks;
+
+        # TODO: restart the iwd.service if something changes
+      })
+      {
+        # disable wpa supplicant
+        networking.wireless.enable = false;
+
+        # Set the network manager backend to iwd
+        networking.networkmanager.wifi.backend = "iwd";
+
+        # Use iwd instead of wpa_supplicant. It has a user friendly CLI
+        networking.wireless.iwd = {
+          enable = true;
+          settings = {
+            Network = {
+              EnableIPv6 = true;
+              RoutePriorityOffset = 300;
+            };
+            Settings.AutoConnect = true;
+          };
+        };
+      }
+    ];
+  }

clanServices/wifi/default.nix

@@ -14,7 +14,6 @@ in
   roles.default = {
     interface = {
       options.networks = lib.mkOption {
-        visible = false;
         type = lib.types.attrsOf (
           lib.types.submodule (
             { ... }: