Checkin to see if lib gets fudo

lib/types/user.nix

@@ -1,6 +1,7 @@
 { lib, ... }:
 
-{
+with lib;
+rec {
   systemUserOpts = { username, ... }: {
     options = with lib.types; {
       username = mkOption {
@@ -95,20 +96,25 @@
       };
 
       ssh-keys = mkOption {
-        type = nullOr (listOf (submodule sshKeyOpts));
+        type = listOf (submodule sshKeyOpts);
         description = "Path to the user's public and private key files.";
         default = [];
       };
+
+      email = mkOption {
+        type = nullOr str;
+        description = "User's primary email address.";
+        default = null;
+      };
     };
   };
 
   groupOpts = { group-name, ... }: {
     options = with lib.types; {
-      group-name = mkOption {
-        type = nullOr str;
-        default = group-name;
-        description = "Group name.";
-      };
+      # group-name = mkOption {
+      #   description = "Group name.";
+      #   default = group-name;
+      # };
 
       description = mkOption {
         type = str;