diff --git a/nix/configurations/hetzner_benchmark.nix b/nix/configurations/hetzner_benchmark.nix
index f14a3cf9..6664da7d 100644
--- a/nix/configurations/hetzner_benchmark.nix
+++ b/nix/configurations/hetzner_benchmark.nix
@@ -52,7 +52,6 @@ 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
deleted file mode 100644
index 58d07dc1..00000000
--- a/nix/configurations/hetzner_benchmark/nixos/programs.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  # Helps with kitty when ssh from remote
-  environment.enableAllTerminfo = true;
-}
diff --git a/nix/configurations/vanadium/home/xmobar/xmobar.hs b/nix/configurations/vanadium/home/xmobar/xmobar.hs
index 29a159fc..1117d7cd 100644
--- a/nix/configurations/vanadium/home/xmobar/xmobar.hs
+++ b/nix/configurations/vanadium/home/xmobar/xmobar.hs
@@ -76,10 +76,8 @@ 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"
               ]
               ""
diff --git a/nix/homeModules/common/gpg.nix b/nix/homeModules/common/gpg.nix
index 916db466..1ef69531 100644
--- a/nix/homeModules/common/gpg.nix
+++ b/nix/homeModules/common/gpg.nix
@@ -44,10 +44,6 @@
         user = "confusedkernel";
         hash = "sha256-9DdtDAcv+2Z0jJMSLAXbp5ne8uHYj5V/lNGi0kKSdv4=";
       }
-      {
-        user = "gautaz";
-        hash = "sha256-j0I9l8uKfzKNrc2qveFi5mkRppxL36+BUEqvFPs6vqA=";
-      }
     ]
     ++ map fromUrl [
       {
diff --git a/nix/networks/list.nix b/nix/networks/list.nix
index 8095998f..de5c9fc9 100644
--- a/nix/networks/list.nix
+++ b/nix/networks/list.nix
@@ -81,14 +81,6 @@ in
     hasPassword = true;
     randomizeMac = true;
   }
-  {
-    ssid = "R802";
-    randomizeMac = true;
-  }
-  {
-    ssid = "R1108";
-    randomizeMac = true;
-  }
 
   { ssid = "_SNCF_WIFI_INOUI"; }
   { ssid = "_WIFI_LYRIA"; }
@@ -97,7 +89,6 @@ in
   { ssid = "AOT Airport Free Wi-Fi by NT"; }
   { ssid = "NewTaipei"; }
   { ssid = "Fami-WiFi"; }
-  { ssid = "THSR_freeWIFI_ALL"; }
 
   {
     ssid = "iPhone de Léana 江";
diff --git a/nix/networks/wpa_supplicant-compat.nix b/nix/networks/wpa_supplicant-compat.nix
index a4db89a7..02c2c26c 100644
--- a/nix/networks/wpa_supplicant-compat.nix
+++ b/nix/networks/wpa_supplicant-compat.nix
@@ -15,8 +15,6 @@ let
       hasPassword ? false,
       scanOnLowSignal ? false,
       randomizeMac ? false,
-      # TODO: adapt to the 25.11 interface
-      bssid ? null,
       ...
     }:
     {
@@ -26,18 +24,20 @@ let
           "hasPassword"
           "scanOnLowSignal"
           "randomizeMac"
-          "bssid"
         ])
         (lib.optionalAttrs hasPassword {
           pskRaw = "ext:${escapePwdKey ssid}";
         })
-        {
+        (lib.optionalAttrs scanOnLowSignal {
           extraConfig = ''
-            ${lib.optionalString scanOnLowSignal "bgscan=\"simple:30:-70:3600\""}
-            ${lib.optionalString randomizeMac "mac_addr=1"}
-            ${lib.optionalString (bssid != null) "bssid=\"${bssid}\""}
+            bgscan="simple:30:-70:3600"
           '';
-        }
+        })
+        (lib.optionalAttrs randomizeMac {
+          extraConfig = ''
+            mac_addr=1
+          '';
+        })
       ];
     };
 in