From 54f685e90c30e4834c4ef709ded65bc47df8259e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Tue, 2 Dec 2025 14:37:05 +0800
Subject: [PATCH 1/4] networks: update

---
 nix/networks/list.nix        |   5 +++++
 nix/secrets/wpa_password.age | Bin 894 -> 920 bytes
 2 files changed, 5 insertions(+)

diff --git a/nix/networks/list.nix b/nix/networks/list.nix
index 75127935..4ec25b95 100644
--- a/nix/networks/list.nix
+++ b/nix/networks/list.nix
@@ -14,6 +14,11 @@ in
     priority = privatePriority;
     hasPassword = true;
   }
+  {
+    ssid ="Kuo";
+    priority = privatePriority;
+    hasPassword = true;
+  }
   {
     ssid = "girlypop-net";
     priority = privatePriority;
diff --git a/nix/secrets/wpa_password.age b/nix/secrets/wpa_password.age
index 47b97605b0e33842c19d9ae2094ef6906f4fc349..17fe933a12c35c3483098c7731b9a81331bf2474 100644
GIT binary patch
delta 851
zcmV-Z1FZc12ABtsEPqsFLq}#uMOrsFb7o66X*6wBL1aR2V>w!4FEw*lY&U6bN?Arn
zR6#gLcM5n(OK3}CN-J1KL`iElR8MbZXI6M?H%B&bM`tiHR#Y%oL2hz-L2qX-O$seO
zAaiqQEoEdfH8n9gAZv3lYcN3|IYm-+Phx0UMrm|0F?MWeMMhL{IBaroby;&TL1RU6
zGE_lwFjh4yPE%}m3OH6~Z+0>?cy?xUF-L7kOKDR$IBi8RG&5ytO?hQ@XirTrZBsLI
zacFmQk?|K-QCdb-dNX5DT1r}1QBN;yD{WRuW^qVUZAC9xH)%Imcvo#SY;svwc}PhL
zXGUdGZFzb#Y-4CgZhA*gWkqB(XfktfZFVq0Nj5iHNHI=rQBPWSGfh#GUjY|?T6b1d
zGi+u;HE>#XPFHPWFHcTJQ#N-&G)yybXHhh4cXxPtMPp`XFL!SWMPo~HZ*)RyOG7z1
zN?JB|N<?N_HbYN0a!E%-Gg)bQPk3%*RBCH4WidDkEj}P-A#qqGcy=vka%Ew2WeRUA
zVR&*mR(3K;ZgX^WGcZDWX)<kpLP&UeR%b#uPH1;+F-&AObYw_zHc)PBWiWF>HCYNR
zEiE8eHBeAEX=h?;GEZ|eYItU6L{2hzGG$|0bYXLGPI6{KS~5Z~R4+(HMMVmqOV`L=
zVuRVI&!-WO<z9A`Wt<?`LPFbY<kIylg*i+hb@Z7oJE3?0TF_Ns&TvtG?!M&iF4&B6
za7Lag@exl%lRkKH|ENOiYQc+Vi_6>`{Jp2EC+**jo{(H<Jlr}bMy|W4R$4yjKqFR2
zX1o)vkk=ugl)rgLD*Zus_35caak#n`CE$?4MAE2di~|un)5gt2v`QdcZ+FApM#_~n
zZ@N1e1$U^~jJFFHlom68P*pn2%#K-^RU$sXY{&ST7-i}M@6fj}tjlvUCPnxtLqWnb
zXNqhG!t{=il$w+@VnZ?k#^I2nBLjdO+9l3w&=%^`V=tqsJt4f9Vd0Z+7tm+%G<=MF
zGoU9*QOBUlWAM<|eWnq5Q|&I|I!eho4xQ()$k+K3g;i_F?3`XEG!@Ck8%gu8b3Tpv
dh#Xfvn^myi<DXZ?js~UA7U#2x@H|9Tdp_SJQpW%Q

delta 825
zcmV-91IGNA2mS_-EPrWZW@1V<Rbe<xRBlytZ&)x>V?{P-YGPJzQfW|WLsfNFbxvAE
zYgA)sK?*fua%ga3RcbkFa7}Y*Yfo!*PdRB=bv8msV{>yuH8W^pYA{Y!XJTnFFbXX`
zAaiqQEoEdfH8n9gAZv3lYcN3|Zec`ZL{m&eM|Lkyab;;(P)1BhV`X7(I5ad_W;i)`
zIWI+OH)KRid2Uxl3OP}6Gd6HBa&vS|PDW>IcttN)MM7Fqbwg)VSawQoH*7*;HCb^_
zD_C+xk?|K-csN>aNLoo`dQNC=IBi-)QZ;vMMp{rYR&R1*L`HErNi<SMWI{4%O+-Zs
zI8t<IdT2&NOKV6gb#QieO>TE^D==<ZY%)trMsP@Xb2UYJXJ|HbNL59XUjY|?VlqWB
zOEqmmZ820hdP`GUVpvgTVl-?;IA?fhG-X*xL`-jZPg-+xcQJPgR&zLdbxu-LXJke(
zWJPIGG)XlvaaDC_I9GT@IYvb{LpfwobxUekb9qq;Ej}P-S#D5qEoX9NVRL05KtwBd
zYanS!NFZG{Qy^ezR!Lh5c|}uyPE2c3c~@01WlvUObwp}0YGHLjFIHAHFbXX#Eg)nv
zGBR^gbyaIQRa!7jPfb)>d2w22GGl9FH)2L>FLqT=GB;3kH#2%PNeUpq{OTdtL3QKE
z1c7OFDIvHh%2zm>_72RgR_p6rR=O5!(cJzDm3ZpI&O6O-Km2@BjIZT?f?nA4MdQG`
zXix%2!|UqdLUWI9bp{i21@THM?8|#yLr^k9g`n{5z#3u?=4!;=eSSc&4s-vE2?Ffb
zQG(bZ{**F5Dc=jMD^S2yYL_U+8~-9XwKwPVTMQnvxK<lG4r<~sO(k8#BOC_K15=0{
zGH>vj|H4rBvNtSRE|sHyg<Xs5APm`a&RXo1Aa40nSsWG4Vy`nynV>Vm!%LZ)dc9Fm
zFXPDRj%&0_>jU{CU9Q{I>J4BP4YkiV?z^b!Jr2Q)!+HDjv`^DH3Zn}XWWl%X41g1`
zen1IgXsWR|=I0v98f#3@4upvwiIcA505AS+1Mb^u;Yx!=`+8&y8K-39k*iOVmQD*W
DonJ#I


From 42b32be4a5efbbeaec4da9e625c734e538054b95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Wed, 3 Dec 2025 23:09:43 +0800
Subject: [PATCH 2/4] npins: update zen-browser

---
 npins/sources.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/npins/sources.json b/npins/sources.json
index cee4d919..faf7de90 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -378,9 +378,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "fb066e133e614c024a470608ff56585c4f707b44",
-      "url": "https://github.com/0xc000022070/zen-browser-flake/archive/fb066e133e614c024a470608ff56585c4f707b44.tar.gz",
-      "hash": "04icaki7ygwrq7h4m4bkh5k08rpdr4qagz0z1mbbk4927ljqn30x"
+      "revision": "df63ce4f706567e6efa083ba63d5e7792bf70ffa",
+      "url": "https://github.com/0xc000022070/zen-browser-flake/archive/df63ce4f706567e6efa083ba63d5e7792bf70ffa.tar.gz",
+      "hash": "0aqkcms4a5n4pib06zxm6ljqxssz4lcda73ry76qq7wahpz261q9"
     }
   },
   "version": 5

From 88af6454b72fd50a88fe68d36a0037e917cd2d93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Wed, 3 Dec 2025 23:11:01 +0800
Subject: [PATCH 3/4] networks: update wpa_supplicant-compat shim

---
 nix/networks/wpa_supplicant-compat.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/nix/networks/wpa_supplicant-compat.nix b/nix/networks/wpa_supplicant-compat.nix
index a4db89a7..65f130a0 100644
--- a/nix/networks/wpa_supplicant-compat.nix
+++ b/nix/networks/wpa_supplicant-compat.nix
@@ -1,6 +1,8 @@
 #
 # This loads the list of networks as a NixOS wpa_supplicant compatible attrset
 #
+# View the example config
+# less $(nix-build --no-out-link -E '(import <nixpkgs> {}).wpa_supplicant')/share/doc/wpa_supplicant/wpa_supplicant.conf.example
 let
   sources = import ../../npins;
   lib = import (sources.nixpkgs + "/lib");
@@ -15,18 +17,16 @@ let
       hasPassword ? false,
       scanOnLowSignal ? false,
       randomizeMac ? false,
-      # TODO: adapt to the 25.11 interface
-      bssid ? null,
       ...
     }:
     {
       ${ssid} = lib.mkMerge [
         (builtins.removeAttrs networkArgs [
-          "ssid"
+          # We keep ssid, because it overrides the attrset name ssid
+          # "ssid"
           "hasPassword"
           "scanOnLowSignal"
           "randomizeMac"
-          "bssid"
         ])
         (lib.optionalAttrs hasPassword {
           pskRaw = "ext:${escapePwdKey ssid}";
@@ -35,7 +35,6 @@ let
           extraConfig = ''
             ${lib.optionalString scanOnLowSignal "bgscan=\"simple:30:-70:3600\""}
             ${lib.optionalString randomizeMac "mac_addr=1"}
-            ${lib.optionalString (bssid != null) "bssid=\"${bssid}\""}
           '';
         }
       ];

From d74a8071223f744cf7ab54287b201353950c0831 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Thu, 4 Dec 2025 01:10:10 +0800
Subject: [PATCH 4/4] packages/ruler: update

---
 nix/packages/by-name/ruler/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nix/packages/by-name/ruler/package.nix b/nix/packages/by-name/ruler/package.nix
index e873a2b6..3c36cef9 100644
--- a/nix/packages/by-name/ruler/package.nix
+++ b/nix/packages/by-name/ruler/package.nix
@@ -11,8 +11,8 @@ let
     domain = "git.confusedcompiler.org";
     owner = "leana8959";
     repo = "ruler";
-    rev = "0b4e3ea1e477d4a817da8730fab7fb22ba25fa61";
-    hash = "sha256-CoGJ3uOVEd6K+zFeBkZKVYVm5697Qu9aLYzmlfqGej0=";
+    rev = "89e63d4055cbeca840b6ecaab12683b19e8e2fdd";
+    hash = "sha256-KPbb1JcFNTF5A6ImfGYc1iSxo3K6poCCRGFNqIHwzrM=";
   }) { };
 
   cabalOverrides = o: {