Add lots of missing option types

nixos/modules/system/activation/top-level.nix

@@ -92,8 +92,7 @@ let
     systemd = config.systemd.package;
 
     inherit children;
-    kernelParams =
-      config.boot.kernelParams ++ config.boot.extraKernelParams;
+    kernelParams = config.boot.kernelParams;
     installBootLoader =
       config.system.build.installBootLoader
       or "echo 'Warning: do not know how to make this configuration bootable; please enable a boot loader.' 1>&2; true";
@@ -162,6 +161,7 @@ in
     };
 
     system.copySystemConfiguration = mkOption {
+      type = types.bool;
       default = false;
       description = ''
         If enabled, copies the NixOS configuration file

nixos/modules/system/boot/kernel.nix

@@ -24,7 +24,7 @@ in
       # We don't want to evaluate all of linuxPackages for the manual
       # - some of it might not even evaluate correctly.
       defaultText = "pkgs.linuxPackages";
-      example = "pkgs.linuxPackages_2_6_25";
+      example = literalExample "pkgs.linuxPackages_2_6_25";
       description = ''
         This option allows you to override the Linux kernel used by
         NixOS.  Since things like external kernel module packages are
@@ -40,18 +40,9 @@ in
     };
 
     boot.kernelParams = mkOption {
+      type = types.listOf types.str;
       default = [ ];
-      description = ''
-        The kernel parameters.  If you want to add additional
-        parameters, it's best to set
-        <option>boot.extraKernelParams</option>.
-      '';
-    };
-
-    boot.extraKernelParams = mkOption {
-      default = [ ];
-      example = [ "boot.trace" ];
-      description = "Additional user-defined kernel parameters.";
+      description = "Parameters added to the kernel command line.";
     };
 
     boot.consoleLogLevel = mkOption {
@@ -65,6 +56,7 @@ in
     };
 
     boot.vesa = mkOption {
+      type = types.bool;
       default = false;
       description = ''
         Whether to activate VESA video mode on boot.
@@ -72,13 +64,14 @@ in
     };
 
     boot.extraModulePackages = mkOption {
+      type = types.listOf types.path;
       default = [];
-      # !!! example = [pkgs.nvidia_x11];
+      example = literalExample "[ pkgs.linuxPackages.nvidia_x11 ]";
       description = "A list of additional packages supplying kernel modules.";
     };
 
     boot.kernelModules = mkOption {
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       default = [];
       description = ''
         The set of kernel modules to be loaded in the second stage of
@@ -90,7 +83,7 @@ in
     };
 
     boot.initrd.availableKernelModules = mkOption {
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       default = [];
       example = [ "sata_nv" "ext3" ];
       description = ''
@@ -111,7 +104,7 @@ in
     };
 
     boot.initrd.kernelModules = mkOption {
-      type = types.listOf types.string;
+      type = types.listOf types.str;
       default = [];
       description = "List of modules that are always loaded by the initrd.";
     };

nixos/modules/system/boot/loader/grub/grub.nix

@@ -78,7 +78,7 @@ in
       devices = mkOption {
         default = [];
         example = [ "/dev/hda" ];
-        type = types.listOf types.string;
+        type = types.listOf types.str;
         description = ''
           The devices on which the boot loader, GRUB, will be
           installed. Can be used instead of <literal>device</literal> to

nixos/modules/system/boot/modprobe.nix

@@ -36,6 +36,7 @@ with pkgs.lib;
     };
 
     boot.blacklistedKernelModules = mkOption {
+      type = types.listOf types.str;
       default = [];
       example = [ "cirrusfb" "i2c_piix4" ];
       description = ''

nixos/modules/system/boot/stage-1.nix

@@ -243,39 +243,39 @@ in
       default = true;
       type = types.bool;
       description = ''
-        Whether to run fsck on journaling filesystems such as ext3.
+        Whether to run <command>fsck</command> on journaling filesystems such as ext3.
       '';
     };
 
     boot.initrd.mdadmConf = mkOption {
       default = "";
-      type = with types; string;
+      type = types.lines;
       description = ''
-        Contents of /etc/mdadm.conf at initrd.
+        Contents of <filename>/etc/mdadm.conf</filename> in stage 1.
       '';
     };
 
     boot.initrd.preLVMCommands = mkOption {
       default = "";
-      type = with types; string;
+      type = types.lines;
       description = ''
-        Shell commands to be executed immediately before lvm discovery.
+        Shell commands to be executed immediately before LVM discovery.
       '';
     };
 
     boot.initrd.postDeviceCommands = mkOption {
       default = "";
-      type = with types; string;
+      type = types.lines;
       description = ''
         Shell commands to be executed immediately after stage 1 of the
         boot has loaded kernel modules and created device nodes in
-        /dev.
+        <filename>/dev</filename>.
       '';
     };
 
     boot.initrd.postMountCommands = mkOption {
       default = "";
-      type = with types; string;
+      type = types.lines;
       description = ''
         Shell commands to be executed immediately after the stage 1
         filesystems have been mounted.
@@ -285,7 +285,7 @@ in
     boot.initrd.extraUtilsCommands = mkOption {
       internal = true;
       default = "";
-      type = with types; string;
+      type = types.lines;
       description = ''
         Shell commands to be executed in the builder of the
         extra-utils derivation.  This can be used to provide
@@ -296,7 +296,7 @@ in
     boot.initrd.extraUtilsCommandsTest = mkOption {
       internal = true;
       default = "";
-      type = with types; string;
+      type = types.lines;
       description = ''
         Shell commands to be executed in the builder of the
         extra-utils derivation after patchelf has done its
@@ -306,12 +306,10 @@ in
     };
 
     boot.initrd.compressor = mkOption {
+      internal = true;
       default = "gzip -9";
-
-      type = types.string;
-
-      description = "The compressor to use on the initrd";
-
+      type = types.str;
+      description = "The compressor to use on the initrd image.";
       example = "xz";
     };
 

nixos/modules/system/boot/stage-2.nix

@@ -43,7 +43,7 @@ in
       postBootCommands = mkOption {
         default = "";
         example = "rm -f /var/log/messages";
-        type = types.string;
+        type = types.lines;
         description = ''
           Shell commands to be executed just before systemd is started.
         '';
@@ -80,10 +80,10 @@ in
       };
 
       cleanTmpDir = mkOption {
+        type = types.bool;
         default = false;
-        example = true;
         description = ''
-          Delete all files in /tmp/ during boot.
+          Whether to delete all files in <filename>/tmp</filename> during boot.
         '';
       };
 

nixos/modules/system/etc/etc.nix

@@ -57,6 +57,7 @@ in
             };
 
             target = mkOption {
+              type = types.str;
               description = ''
                 Name of symlink (relative to
                 <filename>/etc</filename>).  Defaults to the attribute
@@ -66,7 +67,7 @@ in
 
             text = mkOption {
               default = null;
-              type = types.nullOr types.string;
+              type = types.nullOr types.lines;
               description = "Text of the file.";
             };
 
@@ -76,6 +77,7 @@ in
             };
 
             mode = mkOption {
+              type = types.str;
               default = "symlink";
               example = "0600";
               description = ''