2 files changed, 7 insertions, 3 deletions
diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix
index 36c915f755f0..9e46ab8b298f 100644
--- a/nixos/modules/programs/shadow.nix
+++ b/nixos/modules/programs/shadow.nix
@@ -48,7 +48,7 @@ in
         Rather, it should be the path of a symlink that points to the
         actual shell in the Nix store.
       '';
-      type = types.uniq types.path;
+      type = types.path;
     };
 
   };
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 64bf25083163..a66679dff90d 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -16,6 +16,7 @@ in
     programs.ssh = {
 
       forwardX11 = mkOption {
+        type = types.bool;
         default = false;
         description = ''
           Whether to request X11 forwarding on outgoing connections by default.
@@ -29,18 +30,21 @@ in
       };
 
       setXAuthLocation = mkOption {
+        type = types.bool;
         default = true;
         description = ''
           Whether to set the path to <command>xauth</command> for X11-forwarded connections.
-          Pulls in X11 dependency.
+          This causes a dependency on X11 packages.
         '';
       };
 
       extraConfig = mkOption {
+        type = types.lines;
         default = "";
         description = ''
           Extra configuration text appended to <filename>ssh_config</filename>.
-          See the ssh_config(5) man page for help.
+          See <citerefentry><refentrytitle>ssh_config</refentrytitle><manvolnum>5</manvolnum></citerefentry>
+          for help.
         '';
       };
     };