From 22df10b69efe3e3549aceb6b1eb0179ad3c240df Mon Sep 17 00:00:00 2001
From: Petri Hienonen <petri.hienonen@gmail.com>
Date: Fri, 5 Dec 2025 10:53:19 +0200
Subject: Update network target

---
 home/wallpapers/default.nix |  2 ++
 hosts/kataja/default.nix    |  7 -------
 hosts/pihlaja/default.nix   |  7 -------
 hosts/saarni/default.nix    |  7 -------
 roles/shared.nix            | 25 ++++++++++++++++++++-----
 5 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/home/wallpapers/default.nix b/home/wallpapers/default.nix
index a358a70..eac5438 100644
--- a/home/wallpapers/default.nix
+++ b/home/wallpapers/default.nix
@@ -73,6 +73,8 @@ in
   systemd.user.timers."wallpaper-fetch" = {
     Unit = {
       Description = "Periodic Unsplash wallpaper fetch timer";
+      After = "network-online.target";
+      Wants = "network-online.target";
     };
     Timer = {
       OnBootSec = "2min";
diff --git a/hosts/kataja/default.nix b/hosts/kataja/default.nix
index 33ce5fa..f820c8c 100644
--- a/hosts/kataja/default.nix
+++ b/hosts/kataja/default.nix
@@ -13,13 +13,6 @@
 
   systemd = {
     network = {
-      enable = true;
-      wait-online.enable = false;
-      config = {
-        networkConfig = {
-          SpeedMeter = true;
-        };
-      };
       networks = {
         "10-wlan" = {
           matchConfig = {
diff --git a/hosts/pihlaja/default.nix b/hosts/pihlaja/default.nix
index 4ed81c5..e46786d 100644
--- a/hosts/pihlaja/default.nix
+++ b/hosts/pihlaja/default.nix
@@ -72,13 +72,6 @@
 
   systemd = {
     network = {
-      enable = true;
-      wait-online.enable = false;
-      config = {
-        networkConfig = {
-          SpeedMeter = true;
-        };
-      };
       networks = {
         "10-wlan" = {
           matchConfig.MACAddress = "34:cf:f6:25:c7:db";
diff --git a/hosts/saarni/default.nix b/hosts/saarni/default.nix
index d7be30a..bbd5305 100644
--- a/hosts/saarni/default.nix
+++ b/hosts/saarni/default.nix
@@ -34,13 +34,6 @@
       };
     };
     network = {
-      enable = true;
-      wait-online.enable = false;
-      config = {
-        networkConfig = {
-          SpeedMeter = true;
-        };
-      };
       networks = {
         "10-lan" = {
           matchConfig = {
diff --git a/roles/shared.nix b/roles/shared.nix
index a8bd23b..3c508ee 100644
--- a/roles/shared.nix
+++ b/roles/shared.nix
@@ -375,6 +375,7 @@
       "use_path_request_style"
       "url=https://s3.tammi.cc"
       "passwd_file=${config.age.secrets.s3fs.path}"
+      "x-systemd.after=network-online.target"
     ];
   };
 
@@ -391,6 +392,7 @@
       "use_path_request_style"
       "url=https://s3.tammi.cc"
       "passwd_file=${config.age.secrets.s3fs.path}"
+      "x-systemd.after=network-online.target"
     ];
   };
 
@@ -513,11 +515,24 @@
     };
   };
 
-  systemd.network.networks."50-bluetooth-pan" = {
-    matchConfig.Name = "bnep*";
-    networkConfig = {
-      DHCP = true;
-      IPv6AcceptRA = true;
+  systemd = {
+    network = {
+      enable = true;
+      wait-online.enable = true;
+      config = {
+        networkConfig = {
+          SpeedMeter = true;
+        };
+      };
+      networks = {
+        "50-bluetooth-pan" = {
+          matchConfig.Name = "bnep*";
+          networkConfig = {
+            DHCP = true;
+            IPv6AcceptRA = true;
+          };
+        };
+      };
     };
   };
 
-- 
cgit v1.2.3-70-g09d2