diff --git a/docs/wifi.md b/docs/wifi.md
index 78304080..25077c21 100644
--- a/docs/wifi.md
+++ b/docs/wifi.md
@@ -10,96 +10,39 @@ The following describes how to setup a Wi-Fi connection on the default pikvm bui
1. Make filesystem writable using `rw` command.
-2. *Optional:* If you want your Raspberry Pi to automatically connect to any configured and available Wi-Fi networks you have to set the following option. On Raspberry Pis `wlan0` is the default name of the wlan device.
+2. Create Wi-Fi settings file `/etc/systemd/network/wlan0.network` with following content:
- ```
- # systemctl enable netctl-auto@wlan0.service
+ ```ini
+ [Match]
+ Name=$WIFI_IFACE
+
+ [Network]
+ DHCP=yes
+ DNSSEC=no
+
+ # Use same IP by forcing to use MAC address for clientID
+ [DHCP]
+ ClientIdentifier=mac
```
-3. Create Wi-Fi profiles
-
- * **Using the interactive dialog**
-
- You can create Wi-Fi profiles either manually or by using `wifi-menu`. This requires the Wi-Fi you want to connect to in signal range.
-
- ```
- # wifi-menu -o
- ```
-
- The `-o` makes sure that the Wi-Fi passphrase is stored encrypted. Otherwise it will be stored in cleartext in the profile file. `wifi-menu` will scan for all available Wi-Fi networks and provide you a list:
-
- 
-
- Select the Wi-Fi you want to connect to and give the profile file a name. The default name is `wlan0-wifiname`:
-
- 
-
- Enter the WPA-Passphrase:
-
- 
-
- Afterwards `wifi-menu` will try to connect to the Wi-Fi. If you're connected via ssh or the Web Terminal you'll loose connection to the Raspberry Pi. Most DHCP servers will give the Raspberry Pi a new (and usually different) IP address for each interface (LAN / WLAN).
-
- If everything worked out you should be connected to your Wi-Fi now. `wifi-menu` created a new profile file for you in */etc/netctl*.
-
- * **Manually**
-
- If you want to store the Wi-Fi passphrase encrypted you have to generate it via `wpa_passphrase`:
-
- ```
- # wpa_passphrase wifiname this_is_my_great_and_secure_key_1234567890
- ```
-
- 
-
- Copy the second hexadecimal string without `psk=`. In this example `814c45d0f88f60636532b034c463639a506670f8ba3c7965e62cdbc1989f6d66`.
-
- Create a new file with the editor of your choice (nano, vim, etc.):
-
- ```
- # nano /etc/netctl/wlan0-wifiname
- ```
-
- Copy the following template into the file and modify it with your parameters.
-
- Note the `\"` after `Key=` is required for encrypted passphrases. If you want to put your Wi-Fi passphrase in cleartext the \\" is not required. See [this](https://github.com/joukewitteveen/netctl/blob/master/docs/netctl.profile.5.txt) for the quoting rules and more Wi-Fi profile configuration options.
-
- ```bash
- Description='My great Wi-Fi'
- Interface=wlan0
- Connection=wireless
- Security=wpa
- ESSID=wifiname
- IP=dhcp
- Key=\"814c45d0f88f60636532b034c463639a506670f8ba3c7965e62cdbc1989f6d66
- ```
-
- Save the file and you're good to go. You can manually connect to the profile you've just created with:
-
- ```
- # netctl-auto switch-to wlan0-wifiname
- ```
-
-4. To add the hidden ESSID you need to edit `/etc/netctl/wlan0-` file and add the hidden option:
-
- ```bash
- Description='Hidden SSID template'
- Interface=wlan0
- Connection=wireless
- Security=wpa
- ESSID=WIFI-Name
- IP=dhcp
- Key=supersecretpassword
- Hidden=yes
- ```
-
-5. *Optional:* If you want to connect to a 5GHz Wi-Fi in the US and it's not listed, create `/etc/wpa_supplicant/wpa_supplicant-wlan0.conf` with a single line `country=US`, and enable it with:
+3. Set network ESSID and password:
```
- # systemctl enable wpa_supplicant@wlan0
+ # wpa_passphrase MyNetwork "P@assw0rd" > /etc/wpa_supplicant/wpa_supplicant-wlan0.conf
```
-6. Make filesystem read-only again using `ro` command
+ !!! note "Using Wi-Fi with hidden ESSID"
+ Add option `scan_ssid=1` to `/etc/wpa_supplicant/wpa_supplicant-wlan0.conf`
+
+ !!! note "Using 5GHz Wi-Fi in the USA"
+ Add option `country=US` to `/etc/wpa_supplicant/wpa_supplicant-wlan0.conf`
+
+4. Enable WPA-supplicant service:
+ ```
+ systemctl enable "wpa_supplicant@wlan0.service"
+ ```
+
+5. Make filesystem read-only again using `ro` command
## Useful console commands
@@ -126,4 +69,4 @@ The following describes how to setup a Wi-Fi connection on the default pikvm bui
## Additional resources
-* [Arch Linux Wiki for netctl](https://wiki.archlinux.org/index.php/Netctl)
+* [Arch Linux Wiki for systemd-networkd](https://wiki.archlinux.org/title/systemd-networkd)
diff --git a/docs/wifi/wifi-1.png b/docs/wifi/wifi-1.png
deleted file mode 100644
index 67d604ca..00000000
Binary files a/docs/wifi/wifi-1.png and /dev/null differ
diff --git a/docs/wifi/wifi-2.png b/docs/wifi/wifi-2.png
deleted file mode 100644
index 18c8c8a8..00000000
Binary files a/docs/wifi/wifi-2.png and /dev/null differ
diff --git a/docs/wifi/wifi-3.png b/docs/wifi/wifi-3.png
deleted file mode 100644
index 79603bdb..00000000
Binary files a/docs/wifi/wifi-3.png and /dev/null differ
diff --git a/docs/wifi/wifi-4.png b/docs/wifi/wifi-4.png
deleted file mode 100644
index a46df80c..00000000
Binary files a/docs/wifi/wifi-4.png and /dev/null differ