host roles

nix/lib/config/legacy.nix

@@ -21,19 +21,31 @@ in
 
   config.site.hosts = lib.mkMerge (
     [
+      {
+        server1.role = "server";
+      }
+
       (builtins.mapAttrs (_: switch: {
         inherit (switch) model location password;
         role = "switch";
       }) pillar.switches)
+
       (builtins.mapAttrs (_: ap: {
         inherit (ap) model location password;
         role = "ap";
       }) pillar.cpe)
+
+      (builtins.mapAttrs (_: container: {
+        role = "container";
+        location = "server1";
+      }) pillar.containers)
     ] ++
+
     (map (net:
       builtins.mapAttrs (_: addr4: {
       }) pillar.hosts-inet.${net}
     ) (builtins.attrNames pillar.hosts-inet)) ++
+
     (builtins.concatMap (ctx:
       map (net:
         builtins.mapAttrs (_: addr6: {

nix/lib/config/options.nix

@@ -23,12 +23,18 @@ let
   hostOpts = { name, ... }: {
     options = {
       role = mkOption {
-        type = types.enum [ "ap" "switch" "server" "gateway" "client" ];
+        type = types.enum [ "ap" "switch" "server" "container" "client" ];
         default = "client";
       };
       model = mkOption {
         type = types.str;
-        default = "pc";
+        default = {
+          ap = "unknown";
+          switch = "unknown";
+          server = "pc";
+          container = "lxc";
+          client = "any";
+        }."${config.site.hosts.${name}.role}";
       };
       password = mkOption {
         type = with types; nullOr str;

nix/nixos-module/default.nix

@@ -4,19 +4,16 @@ let
   inherit (config.networking) hostName;
   inherit (lib) optional;
 
-  startsWith = prefix: s:
+  hostConfig = config.site.hosts.${hostName};
-    builtins.substr 0 (builtins.stringLength prefix) s == prefix;
-
-  isServer = startsWith "server" hostName;
 in
 {
   imports = [
     ./defaults.nix
   ]
-  ++ optional isServer [
+  ++ optional (hostConfig.role == "server") [
     ./lxc-containers.nix
   ]
-  ++ optional !isServer [
+  ++ optional (hostConfig.role == "container") [
     ./container.nix
   ];
 }