From c7e5e650623d1539ad0c1ec8dce2b463e59e9e8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 12 Nov 2025 16:21:27 +0800 Subject: [PATCH 1/5] network: update network list --- nix/networks/list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nix/networks/list.nix b/nix/networks/list.nix index de5c9fc9..87ed22f5 100644 --- a/nix/networks/list.nix +++ b/nix/networks/list.nix @@ -81,6 +81,10 @@ in hasPassword = true; randomizeMac = true; } + { + ssid = "R802"; + randomizeMac = true; + } { ssid = "_SNCF_WIFI_INOUI"; } { ssid = "_WIFI_LYRIA"; } @@ -89,6 +93,7 @@ in { ssid = "AOT Airport Free Wi-Fi by NT"; } { ssid = "NewTaipei"; } { ssid = "Fami-WiFi"; } + { ssid = "THSR_freeWIFI_ALL"; } { ssid = "iPhone de Léana 江"; From 83081607ea33bec7c0209b794afdc63aa744d88b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Wed, 12 Nov 2025 19:01:22 +0800 Subject: [PATCH 2/5] network: update network list --- nix/networks/list.nix | 4 ++++ nix/networks/wpa_supplicant-compat.nix | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/nix/networks/list.nix b/nix/networks/list.nix index 87ed22f5..8095998f 100644 --- a/nix/networks/list.nix +++ b/nix/networks/list.nix @@ -85,6 +85,10 @@ in ssid = "R802"; randomizeMac = true; } + { + ssid = "R1108"; + randomizeMac = true; + } { ssid = "_SNCF_WIFI_INOUI"; } { ssid = "_WIFI_LYRIA"; } diff --git a/nix/networks/wpa_supplicant-compat.nix b/nix/networks/wpa_supplicant-compat.nix index 02c2c26c..a4db89a7 100644 --- a/nix/networks/wpa_supplicant-compat.nix +++ b/nix/networks/wpa_supplicant-compat.nix @@ -15,6 +15,8 @@ let hasPassword ? false, scanOnLowSignal ? false, randomizeMac ? false, + # TODO: adapt to the 25.11 interface + bssid ? null, ... }: { @@ -24,20 +26,18 @@ let "hasPassword" "scanOnLowSignal" "randomizeMac" + "bssid" ]) (lib.optionalAttrs hasPassword { pskRaw = "ext:${escapePwdKey ssid}"; }) - (lib.optionalAttrs scanOnLowSignal { + { extraConfig = '' - bgscan="simple:30:-70:3600" + ${lib.optionalString scanOnLowSignal "bgscan=\"simple:30:-70:3600\""} + ${lib.optionalString randomizeMac "mac_addr=1"} + ${lib.optionalString (bssid != null) "bssid=\"${bssid}\""} ''; - }) - (lib.optionalAttrs randomizeMac { - extraConfig = '' - mac_addr=1 - ''; - }) + } ]; }; in From 90e1880e754882cb00309f6dab6527746c3fa379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 13 Nov 2025 17:59:35 +0800 Subject: [PATCH 3/5] vanadium/xmobar: update events --- nix/configurations/vanadium/home/xmobar/xmobar.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nix/configurations/vanadium/home/xmobar/xmobar.hs b/nix/configurations/vanadium/home/xmobar/xmobar.hs index 1117d7cd..29a159fc 100644 --- a/nix/configurations/vanadium/home/xmobar/xmobar.hs +++ b/nix/configurations/vanadium/home/xmobar/xmobar.hs @@ -76,8 +76,10 @@ config = , "--target", "2025-09-16=snip snip" , "--target", "2025-10-13=no teef" , "--target", "2025-10-31=dragon book" + , "--target", "2025-11-21=scalpel" + , "--target", "2025-11-21=baguette" , "--target", "2025-11-29=à deux" - , "--target", "2025-12-16=dragon book²" + , "--target", "2025-12-16=dragon book" , "--target", "2025-12-30=seule" ] "" From cf2cf553e0894354e23548816fb9b9e01dec901b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Thu, 13 Nov 2025 18:14:11 +0800 Subject: [PATCH 4/5] home/gpg: update trusted keys --- nix/homeModules/common/gpg.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nix/homeModules/common/gpg.nix b/nix/homeModules/common/gpg.nix index 1ef69531..916db466 100644 --- a/nix/homeModules/common/gpg.nix +++ b/nix/homeModules/common/gpg.nix @@ -44,6 +44,10 @@ user = "confusedkernel"; hash = "sha256-9DdtDAcv+2Z0jJMSLAXbp5ne8uHYj5V/lNGi0kKSdv4="; } + { + user = "gautaz"; + hash = "sha256-j0I9l8uKfzKNrc2qveFi5mkRppxL36+BUEqvFPs6vqA="; + } ] ++ map fromUrl [ { From 77dc32f91c05414691343f2be0e71a2bc0368b2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= Date: Sat, 15 Nov 2025 13:12:36 +0800 Subject: [PATCH 5/5] hetzner_benchmark: install terminfo --- nix/configurations/hetzner_benchmark.nix | 1 + nix/configurations/hetzner_benchmark/nixos/programs.nix | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 nix/configurations/hetzner_benchmark/nixos/programs.nix diff --git a/nix/configurations/hetzner_benchmark.nix b/nix/configurations/hetzner_benchmark.nix index 6664da7d..f14a3cf9 100644 --- a/nix/configurations/hetzner_benchmark.nix +++ b/nix/configurations/hetzner_benchmark.nix @@ -52,6 +52,7 @@ in ./hetzner_benchmark/nixos/hardware-configuration.nix ./hetzner_benchmark/nixos/misc.nix + ./hetzner_benchmark/nixos/programs.nix ../nixosModules/common/fish.nix ../nixosModules/common/disable-command-not-found.nix diff --git a/nix/configurations/hetzner_benchmark/nixos/programs.nix b/nix/configurations/hetzner_benchmark/nixos/programs.nix new file mode 100644 index 00000000..58d07dc1 --- /dev/null +++ b/nix/configurations/hetzner_benchmark/nixos/programs.nix @@ -0,0 +1,4 @@ +{ + # Helps with kitty when ssh from remote + environment.enableAllTerminfo = true; +}