Move profiles from ./profile-config to ./profile

lib/types/host.nix

@@ -1,7 +1,10 @@
 { lib, ... }:
 
 with lib;
-rec {
+let
+  passwd = import ../passwd.nix { inherit lib; };
+
+in rec {
   encryptedFSOpts = { ... }: let
     mountpoint = { mp, ... }: {
       options = with types; {
@@ -31,6 +34,12 @@ rec {
           '';
           default = [ ];
         };
+
+        world-readable = mkOption {
+          type = bool;
+          description = "Whether to leave the top level world-readable.";
+          default = true;
+        };
       };
     };
   in {
@@ -81,7 +90,9 @@ rec {
     };
   };
 
-  hostOpts = { hostname, ... }: {
+  hostOpts = { name, ... }: let
+    hostname = name;
+  in {
     options = with types; {
       master-key = mkOption {
         type = nullOr (submodule masterKeyOpts);
@@ -284,6 +295,11 @@ rec {
         description = "Configuration parameters to set up initrd SSH network.";
         default = null;
       };
+
+      backplane-password-file = mkOption {
+        options = path;
+        description = "File containing the password used by this host to connect to the backplane.";
+      };
     };
   };
 }

lib/types/user.nix

@@ -2,12 +2,12 @@
 
 with lib;
 rec {
-  systemUserOpts = { username, ... }: {
+  systemUserOpts = { name, ... }: {
     options = with lib.types; {
       username = mkOption {
         type = str;
         description = "The system user's login name.";
-        default = username;
+        default = name;
       };
 
       description = mkOption {
@@ -23,7 +23,9 @@ rec {
     };
   };
 
-  userOpts = { username, ... }: {
+  userOpts = { name, ... }: let
+    username = name;
+  in {
     options = with lib.types; {
       username = mkOption {
         type = str;