Refactor modules/features a bit

clusters/k0/default.nix

@@ -15,10 +15,13 @@ let
   };
 
   master = {
+    features.host = {
+      name = "k0-0";
+      address = "10.1.8.50";
+    };
     features.k8s = {
-      host.name = "k0-0";
-      host.address = "10.1.8.50";
       master.enable = true;
+      master.socat443 = true;
       nodes = nodes;
       inherit etcdCluster;
     };
@@ -34,7 +37,7 @@ let
     "${x.name}" =
     lib.mkMerge [
       {
-        features.k8s.host = x;
+        features.host = x;
       }
       (if builtins.hasAttr x.name etcdNodes then
         {
@@ -47,5 +50,5 @@ let
 
 in
   builtins.foldl' (a: x: a // mkNode x) {
-    "${master.features.k8s.host.name}" = master;
+    "${master.features.host.name}" = master;
   } nodes