diff --git a/hosts/gaming/configuration.nix b/hosts/gaming/configuration.nix
index ede10ad..57d1e63 100644
--- a/hosts/gaming/configuration.nix
+++ b/hosts/gaming/configuration.nix
@@ -1,10 +1,5 @@
-{ config, lib, ... }:
+{ lib, ... }:
 {
-  services.clatd = {
-    enable = true;
-    settings.clat-v6-addr = "${config.custom.gua_pref}11::c1";
-  };
-
   imports = [
     ../../shared/base.nix
     ../../shared/hardware/nvidia.nix
diff --git a/personal/networking/home-wg.nix b/personal/networking/home-wg.nix
index be1e13b..7893d93 100644
--- a/personal/networking/home-wg.nix
+++ b/personal/networking/home-wg.nix
@@ -25,8 +25,6 @@
       };
 
       networking = {
-        networkmanager.settings."connection"."ipv4.dhcp-ipv6-only-preferred" = 1;
-
         wg-quick.interfaces = {
           wg0 = {
             autostart = true;
@@ -50,10 +48,7 @@
         };
       };
 
-      services.clatd = {
-        enable = true;
-        settings.clat-v6-addr = "${config.custom.gua_pref}ff::c${config.custom.home_wg_suffix}";
-      };
+      services.clatd.settings.clat-v6-addr = "${config.custom.gua_pref}ff::c${config.custom.home_wg_suffix}";
 
       systemd.services = {
         "wg-quick-wg0" = {
diff --git a/shared/base.nix b/shared/base.nix
index f612cc0..38d5574 100644
--- a/shared/base.nix
+++ b/shared/base.nix
@@ -94,7 +94,7 @@
       set -s escape-time 0
     '';
 
-    ######################################## SSH configuration #########################
+    ######################################## SSH configuration ######################################
     services.openssh = {
       enable = true;
       settings.PasswordAuthentication = false;
@@ -128,9 +128,6 @@
     };
     time.timeZone = "Europe/Helsinki";
 
-    ######################################## Memory management ######################################
-    zramSwap.enable = true;
-
     ######################################## Housekeeping ###########################################
     system.autoUpgrade = {
       enable = true;
@@ -166,17 +163,24 @@
       };
     };
 
-    ######################################## Misc. ##################################################
+    ######################################## Networking. ############################################
     networking = {
       # Easiest to use and most distros use this by default.
       networkmanager = {
         enable = true;
         # Use EUI-64 addresses by default, so that addresses are predictable
-        settings."connection"."ipv6.addr-gen-mode" = 0;
+        settings."connection" = {
+          "ipv4.dhcp-ipv6-only-preferred" = 1;
+          "ipv6.addr-gen-mode" = 0;
+        };
       };
       # IPv6 privacy addresses for outgoing traffic
       tempAddresses = "default";
     };
+    services.clatd.enable = true;
+
+    ######################################## Misc. ##################################################
+    zramSwap.enable = true;
 
     users.mutableUsers = false; # Force all user management to happen throught nix-files