diff --git a/hosts/biolimo/configuration.nix b/hosts/biolimo/configuration.nix
index bb8c47c..8f72e33 100644
--- a/hosts/biolimo/configuration.nix
+++ b/hosts/biolimo/configuration.nix
@@ -20,9 +20,6 @@ in {
 
   hardware.cpu.intel.updateMicrocode = true;
 
-  networking.hostName = "biolimo";
-  networking.networkmanager.wifi.backend = "wpa_supplicant";
-
   home-manager.users."${psCfg.user.name}" = {
     xdg.configFile = {
       "sway/config.d/10-screens.conf".source = ./.config/sway/config.d/screens.conf;
diff --git a/hosts/biolimo/networking.nix b/hosts/biolimo/networking.nix
index fc828ae..de95eda 100644
--- a/hosts/biolimo/networking.nix
+++ b/hosts/biolimo/networking.nix
@@ -5,15 +5,16 @@
   lib,
   ...
 }: {
-  config = {
-    age.secrets.wg-private-key.file = "${flake.self}/secrets/wg-private-biolimo.age";
+  networking.hostName = "biolimo";
+  networking.networkmanager.wifi.backend = "wpa_supplicant";
 
-    pub-solar.wireguard-client = {
-      ownIPs = [
-        "10.0.1.6/32"
-        "fd00:b12f:acab:1312:acab:6::/96"
-      ];
-      wireguardPrivateKeyFile = "/run/agenix/wg-private-key";
-    };
+  age.secrets.wg-private-key.file = "${flake.self}/secrets/wg-private-biolimo.age";
+
+  pub-solar.wireguard-client = {
+    ownIPs = [
+      "10.0.1.6/32"
+      "fd00:b12f:acab:1312:acab:6::/96"
+    ];
+    wireguardPrivateKeyFile = "/run/agenix/wg-private-key";
   };
 }
diff --git a/hosts/chocolatebar/configuration.nix b/hosts/chocolatebar/configuration.nix
index 1dc6bbe..fe8087b 100644
--- a/hosts/chocolatebar/configuration.nix
+++ b/hosts/chocolatebar/configuration.nix
@@ -28,8 +28,6 @@ in {
 
   pub-solar.terminal-life.full = true;
 
-  networking.hostName = "chocolatebar";
-
   environment.systemPackages = with pkgs; [
     drone-docker-runner
     stdenv.cc.cc.lib
diff --git a/hosts/chocolatebar/factorio/default.nix b/hosts/chocolatebar/factorio/default.nix
index afad9ef..0d16c6c 100644
--- a/hosts/chocolatebar/factorio/default.nix
+++ b/hosts/chocolatebar/factorio/default.nix
@@ -20,27 +20,25 @@ with lib; let
     '';
   };
 in {
-  config = {
-    services.factorio = {
-      enable = true;
-      port = 34197; # The default, but make it explicit
-      lan = true;
-      game-password = "pls-dont-grief";
-      admins = [
-        "doubtwriter"
-        "kattykat"
-      ];
-      openFirewall = true;
-      autosave-interval = 3;
-      game-name = "Babes plays v2";
-      requireUserVerification = false;
-      bind = "::";
-      mods = [
-        far-reach
-      ];
-    };
-
-    networking.firewall.allowedUDPPorts = [ 34197 ];
-    networking.firewall.allowedTCPPorts = [ 34197 ];
+  services.factorio = {
+    enable = true;
+    port = 34197; # The default, but make it explicit
+    lan = true;
+    game-password = "pls-dont-grief";
+    admins = [
+      "doubtwriter"
+      "kattykat"
+    ];
+    openFirewall = true;
+    autosave-interval = 3;
+    game-name = "Babes plays v2";
+    requireUserVerification = false;
+    bind = "::";
+    mods = [
+      far-reach
+    ];
   };
+
+  networking.firewall.allowedUDPPorts = [ 34197 ];
+  networking.firewall.allowedTCPPorts = [ 34197 ];
 }
diff --git a/hosts/chocolatebar/networking.nix b/hosts/chocolatebar/networking.nix
index 0064af7..cea2521 100644
--- a/hosts/chocolatebar/networking.nix
+++ b/hosts/chocolatebar/networking.nix
@@ -5,15 +5,15 @@
   lib,
   ...
 }: {
-  config = {
-    age.secrets.wg-private-key.file = "${flake.self}/secrets/wg-private-chocolatebar.age";
+  networking.hostName = "chocolatebar";
 
-    pub-solar.wireguard-client = {
-      ownIPs = [
-        "10.0.1.5/32"
-        "fd00:b12f:acab:1312:acab:5::/96"
-      ];
-      wireguardPrivateKeyFile = "/run/agenix/wg-private-key";
-    };
+  age.secrets.wg-private-key.file = "${flake.self}/secrets/wg-private-chocolatebar.age";
+
+  pub-solar.wireguard-client = {
+    ownIPs = [
+      "10.0.1.5/32"
+      "fd00:b12f:acab:1312:acab:5::/96"
+    ];
+    wireguardPrivateKeyFile = "/run/agenix/wg-private-key";
   };
 }