Add givenName & surname

lib/types/user.nix

@@ -1,7 +1,6 @@
 { lib, ... }:
 
-with lib;
-rec {
+with lib; rec {
   systemUserOpts = { name, ... }: {
     options = with lib.types; {
       username = mkOption {
@@ -23,8 +22,8 @@ rec {
     };
   };
 
-  userOpts = { name, ... }: let
-    username = name;
+  userOpts = { name, ... }:
+    let username = name;
     in {
       options = with lib.types; {
         username = mkOption {
@@ -108,6 +107,18 @@ rec {
           description = "Email aliases that should map to this user.";
           default = [ ];
         };
+
+        given-name = mkOption {
+          type = nullOr str;
+          description = "User's given name.";
+          default = null;
+        };
+
+        surname = mkOption {
+          type = nullOr str;
+          description = "User's surname.";
+          default = null;
+        };
       };
     };