From 6570e71ecaf7d13848ff2139a9f8b380fc7466bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?=
 <geoffrey@frogeye.fr>
Date: Mon, 17 Jun 2024 15:23:25 +0200
Subject: [PATCH] wifi: Fix wifi_apply failing on boot

---
 hm/rebuild/default.nix  | 1 +
 os/wireless/apply.py    | 2 ++
 os/wireless/default.nix | 5 ++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/hm/rebuild/default.nix b/hm/rebuild/default.nix
index 135d987..c5b8135 100644
--- a/hm/rebuild/default.nix
+++ b/hm/rebuild/default.nix
@@ -13,6 +13,7 @@
         nixos_flake="$(readlink -f /etc/nixos)"
         if [ -f "$nixos_flake/flake.nix" ]
         then
+          # TODO For extensions this only works on systems where the flake has been resolved
           nix run "$nixos_flake#updateLocalFlakes" -- "$nixos_flake"
           nix run "$nixos_flake#nixosRebuild" -- "$verb" "$@"
         fi
diff --git a/os/wireless/apply.py b/os/wireless/apply.py
index 6599184..69a46f5 100644
--- a/os/wireless/apply.py
+++ b/os/wireless/apply.py
@@ -1,4 +1,6 @@
 """
+Add the networks saved in wireless_networks to wpa_supplicant,
+without restarting it or touching its config file.
 """
 
 import json
diff --git a/os/wireless/default.nix b/os/wireless/default.nix
index 1bb7d22..556df62 100644
--- a/os/wireless/default.nix
+++ b/os/wireless/default.nix
@@ -70,6 +70,9 @@ in
     after = [ "wpa_supplicant.service" ];
     wantedBy = [ "wpa_supplicant.service" ];
     path = with pkgs; [ wpa_supplicant ];
-    script = "${applyScript}";
+    script = ''
+        for i in {1..10}; do wpa_cli status &> /dev/null && break; done
+        ${applyScript}
+    '';
   };
 }