Combine systemd configurations

1 files changed, 22 insertions, 25 deletions

diff --git a/roles/shared.nix b/roles/shared.nix
index 91c41a8..158ec76 100644
--- a/roles/shared.nix
+++ b/roles/shared.nix
@@ -181,6 +181,28 @@
   };
 
   systemd = {
+    network = {
+      enable = true;
+      wait-online = {
+        timeout = 1;
+        enable = true;
+        anyInterface = true;
+      };
+      config = {
+        networkConfig = {
+          SpeedMeter = true;
+        };
+      };
+      networks = {
+        "50-bluetooth-pan" = {
+          matchConfig.Name = "bnep*";
+          networkConfig = {
+            DHCP = true;
+            IPv6AcceptRA = true;
+          };
+        };
+      };
+    };
     user.tmpfiles.users = {
       ${vars.user}.rules = [ "D %C - - - 7d" ];
     };
@@ -533,31 +555,6 @@
     };
   };
 
-  systemd = {
-    network = {
-      enable = true;
-      wait-online = {
-        timeout = 1;
-        enable = true;
-        anyInterface = true;
-      };
-      config = {
-        networkConfig = {
-          SpeedMeter = true;
-        };
-      };
-      networks = {
-        "50-bluetooth-pan" = {
-          matchConfig.Name = "bnep*";
-          networkConfig = {
-            DHCP = true;
-            IPv6AcceptRA = true;
-          };
-        };
-      };
-    };
-  };
-
   hardware = {
     enableAllFirmware = true;
     enableRedistributableFirmware = true;