mullvad: Update relays

This also changes the framework to handle different relay names.

modules/mullvad/default.nix

@@ -5,7 +5,7 @@ let
   cfg = config.sbruder.mullvad;
 
   relayConfigs = lib.mapAttrs'
-    (name: configuration: lib.nameValuePair "mullvad-${name}.conf" (with configuration; ''
+    (name: configuration: lib.nameValuePair "mlv-${name}.conf" (with configuration; ''
       [Interface]
       DNS = ${cfg.dnsServer}
 

modules/mullvad/mullvad.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 # This reads wg-quick compatible configuration files from
-# /etc/wireguard/mullvad-LOCATION.conf
+# /etc/wireguard/mlv-LOCATION.conf
 #
 # Since they are autogenerated by nix and therefore world-readable, they do not
 # include secrets like the private key and client address. Instead, they are
@@ -18,7 +18,7 @@ if (( $# < 1 )); then
 	exit 1
 fi
 
-INTERFACE="mullvad-$1"
+INTERFACE="mlv-$1"
 
 cmd() {
 	echo "[#] $*" >&2
@@ -27,7 +27,7 @@ cmd() {
 
 for interface in /sys/class/net/*; do
 	interface="${interface#/sys/class/net/}"
-	[[ $interface =~ ^mullvad-(v6-)?[a-z]{2}[0-9]*$ ]] && cmd wg-quick down "$interface"
+	[[ $interface =~ ^mlv-(v6-)?[a-z]{2}(-[a-z]{3}-)?[0-9]*$ ]] && cmd wg-quick down "$interface"
 done
 
 if [ "$1" != "off" ]; then

modules/mullvad/update.sh

@@ -3,7 +3,7 @@
 # it into a format that takes up less space than the original response.
 set -euo pipefail
 curl -s 'https://api.mullvad.net/www/relays/wireguard/' | jq '. | map({
-	key: .hostname | split("-")[0],
+	key: (if .hostname | endswith("-wireguard") then .hostname | split("-")[0] else .hostname | sub("-wg-"; "-") end),
 	value: {
 		endpoint4: .ipv4_addr_in,
 		endpoint6: .ipv6_addr_in,

users/simon/modules/sway/waybar.nix

@@ -183,7 +183,7 @@ in
       exec = pkgs.writeShellScript "vpn-state" ''
         ${pkgs.iproute}/bin/ip -j link \
           | ${pkgs.jq}/bin/jq --unbuffered --compact-output '
-            [[.[].ifname | select(. | startswith("mullvad"))][] | split("-")[1] + " ${thinsp}"] as $conns
+            [[.[].ifname | select(. | startswith("mlv"))][] | sub("mlv-"; "") + " ${thinsp}"] as $conns
             | { text: ($conns[0] // ""), class: (if $conns | length > 0 then "connected" else "disconnected" end) }'
       '';
       return-type = "json";