locations: move attrset into config block

modules/locations.nix

@@ -12,7 +12,12 @@ in
 
     locations = lib.mkOption {
       readOnly = true;
-      default = {
+    };
+  };
+
+  config = lib.mkMerge [
+    {
+      custom.locations.locations = {
         services = {
           authoritative_dns = [
             "jorah.cx.ts.hillion.co.uk"
@@ -29,10 +34,10 @@ in
           unifi = "jorah.cx.ts.hillion.co.uk";
         };
       };
-    };
-  };
+    }
 
-  config = lib.mkIf cfg.autoServe {
+    (lib.mkIf cfg.autoServe
+      {
         custom.services = lib.mapAttrsRecursive
           (path: value: {
             enable =
@@ -41,5 +46,6 @@ in
               else config.networking.fqdn == value;
           })
           cfg.locations.services;
-  };
+      })
+  ];
 }