Merge "nixos-option --install" into nixos-generate-config

Having configuration.nix generation hidden underneath nixos-option
never made sense, also given that there was another command to
generate part of the configuration (nixos-hardware-scan).  Now
nixos-generate-config produces both configuration.nix and
hardware-configuration.nix.  The latter is overwritten while the
former is not.

1 files changed, 4 insertions, 36 deletions

diff --git a/nixos/doc/manual/man-nixos-option.xml b/nixos/doc/manual/man-nixos-option.xml
index f7a8ce403dc1..bd180363e70d 100644
--- a/nixos/doc/manual/man-nixos-option.xml
+++ b/nixos/doc/manual/man-nixos-option.xml
@@ -18,17 +18,12 @@
   <cmdsynopsis>
     <command>nixos-option</command>
     <group choice="opt">
-      <option>-i</option>
-      <option>v</option>
-      <option>d</option>
-      <option>l</option>
+      <option>-v</option>
+      <option>-d</option>
+      <option>-l</option>
     </group>
     <arg choice='plain'><replaceable>option.name</replaceable></arg>
   </cmdsynopsis>
-  <cmdsynopsis>
-    <command>nixos-option</command>
-    <arg choice='plain'><option>--install</option></arg>
-  </cmdsynopsis>
 </refsynopsisdiv>
 
 
@@ -40,16 +35,7 @@ of the option name given as argument.  By default, it returns the value of
 the option.</para>
 
 <para>When the option name is not an option, the command prints the list of
-attributes in contained in the attribute set.  This could used to provide
-completion in some editors.</para>
-
-<para>When the option <option>--install</option> (or <option>-i</option>) is
-used with no option name, this command generates a template configuration
-with a scan of the target system.  It produces a template configuration
-in <filename>/etc/nixos/configuration.nix</filename>, and a scan of the
-machine in <filename>/etc/nixos/hardware-configuration.nix</filename>.  The
-scan of the machine is produced
-by <command>nixos-hardware-scan</command>.</para>
+attributes contained in the attribute set.</para>
 
 </refsection>
 
@@ -60,15 +46,6 @@ by <command>nixos-hardware-scan</command>.</para>
 <variablelist>
 
   <varlistentry>
-    <term><option>--install</option>, <option>-i</option></term>
-    <listitem>
-      <para>Use the installation configuration instead of current system
-      configuration.  Generate a template configuration if no option name is
-      specified.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
     <term><option>--value</option>, <option>-v</option></term>
     <listitem>
       <para>Returns the value of the option.  This is the default operation
@@ -103,15 +80,6 @@ by <command>nixos-hardware-scan</command>.</para>
 <variablelist>
 
   <varlistentry>
-    <term><envar>mountPoint</envar></term>
-    <listitem>
-      <para>Location of the target file system.  Defaults to
-      <filename>/mnt</filename>.  This environment variable is only used in
-      combinaison with <option>--install</option> option.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry>
     <term><envar>NIXOS_CONFIG</envar></term>
     <listitem>
       <para>Path to the main NixOS configuration module.  Defaults to