nixos: documentation: move some code around, make docstrings more informative

1 files changed, 17 insertions, 13 deletions

diff --git a/nixos/modules/misc/documentation.nix b/nixos/modules/misc/documentation.nix
index cea8981370bb..4af40a6bb42d 100644
--- a/nixos/modules/misc/documentation.nix
+++ b/nixos/modules/misc/documentation.nix
@@ -16,7 +16,10 @@ let cfg = config.documentation; in
         description = ''
           Whether to install documentation of packages from
           <option>environment.systemPackages</option> into the generated system path.
+
+          See "Multiple-output packages" chapter in the nixpkgs manual for more info.
         '';
+        # which is at ../../../doc/multiple-output.xml
       };
 
       man.enable = mkOption {
@@ -28,25 +31,26 @@ let cfg = config.documentation; in
         '';
       };
 
-      doc.enable = mkOption {
+      info.enable = mkOption {
         type = types.bool;
         default = true;
         description = ''
-          Whether to install documentation distributed in packages' <literal>/share/doc</literal>.
-          Usually plain text and/or HTML.
-          This also includes "doc" outputs.
+          Whether to install info pages and the <command>info</command> command.
+          This also includes "info" outputs.
         '';
       };
 
-      info.enable = mkOption {
+      doc.enable = mkOption {
         type = types.bool;
         default = true;
         description = ''
-          Whether to install info pages and the <command>info</command> command.
-          This also includes "info" outputs.
+          Whether to install documentation distributed in packages' <literal>/share/doc</literal>.
+          Usually plain text and/or HTML.
+          This also includes "doc" outputs.
         '';
       };
 
+
     };
 
   };
@@ -59,6 +63,12 @@ let cfg = config.documentation; in
       environment.extraOutputsToInstall = [ "man" ];
     })
 
+    (mkIf cfg.info.enable {
+      environment.systemPackages = [ pkgs.texinfoInteractive ];
+      environment.pathsToLink = [ "/share/info" ];
+      environment.extraOutputsToInstall = [ "info" ];
+    })
+
     (mkIf cfg.doc.enable {
       # TODO(@oxij): put it here and remove from profiles?
       # environment.systemPackages = [ pkgs.w3m ]; # w3m-nox?
@@ -66,12 +76,6 @@ let cfg = config.documentation; in
       environment.extraOutputsToInstall = [ "doc" ];
     })
 
-    (mkIf cfg.info.enable {
-      environment.systemPackages = [ pkgs.texinfoInteractive ];
-      environment.pathsToLink = [ "/share/info" ];
-      environment.extraOutputsToInstall = [ "info" ];
-    })
-
   ]);
 
 }