diff --git a/index.html b/index.html
index 1bcf302d7..45da55a03 100644
--- a/index.html
+++ b/index.html
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Home Manager Manual</title><link rel="stylesheet" type="text/css" href="style.css" /><link rel="stylesheet" type="text/css" href="overrides.css" /><link rel="stylesheet" type="text/css" href="mono-blue.css" /><script src="highlight.pack.js" type="text/javascript"></script><script src="highlight.load.js" type="text/javascript"></script><meta name="generator" content="DocBook XSL Stylesheets V1.79.2" /><link rel="home" href="index.html" title="Home Manager Manual" /><link rel="next" href="options.html" title="Appendix A. Configuration Options" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Home Manager Manual</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="options.html">Next</a></td></tr></table><hr /></div><div class="book"><div class="titlepage"><div><div><h1 class="title"><a id="book-home-manager-manual"></a>Home Manager Manual</h1></div></div><hr /></div><div class="toc"><dl class="toc"><dt><span class="preface"><a href="index.html#idm140737328624432">Preface</a></span></dt><dt><span class="chapter"><a href="index.html#ch-installation">1. Installing Home Manager</a></span></dt><dd><dl><dt><span class="section"><a href="index.html#sec-install-standalone">1.1. Standalone installation</a></span></dt><dt><span class="section"><a href="index.html#sec-install-nixos-module">1.2. NixOS module</a></span></dt><dt><span class="section"><a href="index.html#sec-install-nix-darwin-module">1.3. nix-darwin module</a></span></dt></dl></dd><dt><span class="chapter"><a href="index.html#ch-writing-modules">2. Writing Home Manager Modules</a></span></dt><dd><dl><dt><span class="section"><a href="index.html#sec-option-types">2.1. Option Types</a></span></dt></dl></dd><dt><span class="chapter"><a href="index.html#ch-contributing">3. Contributing</a></span></dt><dd><dl><dt><span class="section"><a href="index.html#sec-contrib-getting-started">3.1. Getting started</a></span></dt><dt><span class="section"><a href="index.html#sec-guidelines">3.2. Guidelines</a></span></dt><dd><dl><dt><span class="section"><a href="index.html#sec-guidelines-back-compat">3.2.1. Maintain backward compatibility</a></span></dt><dt><span class="section"><a href="index.html#sec-guidelines-forward-compat">3.2.2. Keep forward compatibility in mind</a></span></dt><dt><span class="section"><a href="index.html#sec-guidelines-valuable-options">3.2.3. Add only valuable options</a></span></dt><dt><span class="section"><a href="index.html#sec-guidelines-add-tests">3.2.4. Add relevant tests</a></span></dt><dt><span class="section"><a href="index.html#sec-guidelines-module-maintainer">3.2.5. Add relevant documentation</a></span></dt><dt><span class="section"><a href="index.html#_add_yourself_as_a_module_maintainer">3.2.6. Add yourself as a module maintainer</a></span></dt><dt><span class="section"><a href="index.html#sec-guidelines-code-style">3.2.7. Format your code</a></span></dt><dt><span class="section"><a href="index.html#sec-guidelines-commit-message-style">3.2.8. Format your commit messages</a></span></dt><dt><span class="section"><a href="index.html#sec-guidelines-news-style">3.2.9. Format your news entries</a></span></dt><dt><span class="section"><a href="index.html#sec-guidelines-conditional-modules">3.2.10. Use conditional modules and news</a></span></dt><dt><span class="section"><a href="index.html#sec-guidelines-licensing">3.2.11. Mind the license</a></span></dt></dl></dd><dt><span class="section"><a href="index.html#sec-commit-style">3.3. Commits</a></span></dt><dt><span class="section"><a href="index.html#sec-code-style">3.4. Code Style</a></span></dt><dt><span class="section"><a href="index.html#sec-news">3.5. News</a></span></dt><dt><span class="section"><a href="index.html#sec-tests">3.6. Tests</a></span></dt></dl></dd><dt><span class="chapter"><a href="index.html#ch-faq">4. Frequently Asked Questions (FAQ)</a></span></dt><dd><dl><dt><span class="section"><a href="index.html#_why_is_there_a_collision_error_when_switching_generation">4.1. Why is there a collision error when switching generation?</a></span></dt><dt><span class="section"><a href="index.html#_why_are_the_session_variables_not_set">4.2. Why are the session variables not set?</a></span></dt><dt><span class="section"><a href="index.html#_how_do_set_up_a_configuration_for_multiple_users_machines">4.3. How do set up a configuration for multiple users/machines?</a></span></dt><dt><span class="section"><a href="index.html#_why_do_i_get_an_error_message_about_literal_ca_desrt_dconf_literal">4.4. Why do I get an error message about <code class="literal">ca.desrt.dconf</code>?</a></span></dt><dt><span class="section"><a href="index.html#_how_do_i_install_packages_from_nixpkgs_unstable">4.5. How do I install packages from Nixpkgs unstable?</a></span></dt><dt><span class="section"><a href="index.html#_how_do_i_override_the_package_used_by_a_module">4.6. How do I override the package used by a module?</a></span></dt></dl></dd><dt><span class="appendix"><a href="options.html">A. Configuration Options</a></span></dt><dt><span class="appendix"><a href="nixos-options.html">B. NixOS Module Options</a></span></dt><dt><span class="appendix"><a href="nix-darwin-options.html">C. nix-darwin Module Options</a></span></dt><dt><span class="appendix"><a href="tools.html">D. Tools</a></span></dt><dd><dl><dt><span class="refentrytitle"><a href="tools.html#idm140737311928992"><span class="command"><strong>home-manager</strong></span>
-  </a></span><span class="refpurpose"> — reconfigure a user environment</span></dt></dl></dd><dt><span class="appendix"><a href="release-notes.html">E. Release Notes</a></span></dt><dd><dl><dt><span class="section"><a href="release-notes.html#sec-release-21.03">E.1. Release 21.03</a></span></dt><dd><dl><dt><span class="section"><a href="release-notes.html#sec-release-21.03-highlights">E.1.1. Highlights</a></span></dt><dt><span class="section"><a href="release-notes.html#sec-release-21.03-state-version-changes">E.1.2. State Version Changes</a></span></dt></dl></dd><dt><span class="section"><a href="release-notes.html#sec-release-20.09">E.2. Release 20.09</a></span></dt><dd><dl><dt><span class="section"><a href="release-notes.html#sec-release-20.09-highlights">E.2.1. Highlights</a></span></dt><dt><span class="section"><a href="release-notes.html#sec-release-20.09-state-version-changes">E.2.2. State Version Changes</a></span></dt></dl></dd><dt><span class="section"><a href="release-notes.html#sec-release-20.03">E.3. Release 20.03</a></span></dt><dd><dl><dt><span class="section"><a href="release-notes.html#sec-release-20.03-highlights">E.3.1. Highlights</a></span></dt><dt><span class="section"><a href="release-notes.html#sec-release-20.03-state-version-changes">E.3.2. State Version Changes</a></span></dt></dl></dd><dt><span class="section"><a href="release-notes.html#sec-release-19.09">E.4. Release 19.09</a></span></dt><dd><dl><dt><span class="section"><a href="release-notes.html#sec-release-19.09-highlights">E.4.1. Highlights</a></span></dt><dt><span class="section"><a href="release-notes.html#sec-release-19.09-state-version-changes">E.4.2. State Version Changes</a></span></dt></dl></dd><dt><span class="section"><a href="release-notes.html#sec-release-19.03">E.5. Release 19.03</a></span></dt><dd><dl><dt><span class="section"><a href="release-notes.html#sec-release-19.03-highlights">E.5.1. Highlights</a></span></dt><dt><span class="section"><a href="release-notes.html#sec-release-19.03-state-version-changes">E.5.2. State Version Changes</a></span></dt></dl></dd><dt><span class="section"><a href="release-notes.html#sec-release-18.09">E.6. Release 18.09</a></span></dt></dl></dd></dl></div><div class="preface"><div class="titlepage"><div><div><h1 class="title"><a id="idm140737328624432"></a>Preface</h1></div></div></div><p>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Home Manager Manual</title><link rel="stylesheet" type="text/css" href="style.css" /><link rel="stylesheet" type="text/css" href="overrides.css" /><link rel="stylesheet" type="text/css" href="mono-blue.css" /><script src="highlight.pack.js" type="text/javascript"></script><script src="highlight.load.js" type="text/javascript"></script><meta name="generator" content="DocBook XSL Stylesheets V1.79.2" /><link rel="home" href="index.html" title="Home Manager Manual" /><link rel="next" href="options.html" title="Appendix A. Configuration Options" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Home Manager Manual</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="options.html">Next</a></td></tr></table><hr /></div><div class="book"><div class="titlepage"><div><div><h1 class="title"><a id="book-home-manager-manual"></a>Home Manager Manual</h1></div></div><hr /></div><div class="toc"><dl class="toc"><dt><span class="preface"><a href="index.html#idm140737328863552">Preface</a></span></dt><dt><span class="chapter"><a href="index.html#ch-installation">1. Installing Home Manager</a></span></dt><dd><dl><dt><span class="section"><a href="index.html#sec-install-standalone">1.1. Standalone installation</a></span></dt><dt><span class="section"><a href="index.html#sec-install-nixos-module">1.2. NixOS module</a></span></dt><dt><span class="section"><a href="index.html#sec-install-nix-darwin-module">1.3. nix-darwin module</a></span></dt></dl></dd><dt><span class="chapter"><a href="index.html#ch-writing-modules">2. Writing Home Manager Modules</a></span></dt><dd><dl><dt><span class="section"><a href="index.html#sec-option-types">2.1. Option Types</a></span></dt></dl></dd><dt><span class="chapter"><a href="index.html#ch-contributing">3. Contributing</a></span></dt><dd><dl><dt><span class="section"><a href="index.html#sec-contrib-getting-started">3.1. Getting started</a></span></dt><dt><span class="section"><a href="index.html#sec-guidelines">3.2. Guidelines</a></span></dt><dd><dl><dt><span class="section"><a href="index.html#sec-guidelines-back-compat">3.2.1. Maintain backward compatibility</a></span></dt><dt><span class="section"><a href="index.html#sec-guidelines-forward-compat">3.2.2. Keep forward compatibility in mind</a></span></dt><dt><span class="section"><a href="index.html#sec-guidelines-valuable-options">3.2.3. Add only valuable options</a></span></dt><dt><span class="section"><a href="index.html#sec-guidelines-add-tests">3.2.4. Add relevant tests</a></span></dt><dt><span class="section"><a href="index.html#sec-guidelines-module-maintainer">3.2.5. Add relevant documentation</a></span></dt><dt><span class="section"><a href="index.html#_add_yourself_as_a_module_maintainer">3.2.6. Add yourself as a module maintainer</a></span></dt><dt><span class="section"><a href="index.html#sec-guidelines-code-style">3.2.7. Format your code</a></span></dt><dt><span class="section"><a href="index.html#sec-guidelines-commit-message-style">3.2.8. Format your commit messages</a></span></dt><dt><span class="section"><a href="index.html#sec-guidelines-news-style">3.2.9. Format your news entries</a></span></dt><dt><span class="section"><a href="index.html#sec-guidelines-conditional-modules">3.2.10. Use conditional modules and news</a></span></dt><dt><span class="section"><a href="index.html#sec-guidelines-licensing">3.2.11. Mind the license</a></span></dt></dl></dd><dt><span class="section"><a href="index.html#sec-commit-style">3.3. Commits</a></span></dt><dt><span class="section"><a href="index.html#sec-code-style">3.4. Code Style</a></span></dt><dt><span class="section"><a href="index.html#sec-news">3.5. News</a></span></dt><dt><span class="section"><a href="index.html#sec-tests">3.6. Tests</a></span></dt></dl></dd><dt><span class="chapter"><a href="index.html#ch-faq">4. Frequently Asked Questions (FAQ)</a></span></dt><dd><dl><dt><span class="section"><a href="index.html#_why_is_there_a_collision_error_when_switching_generation">4.1. Why is there a collision error when switching generation?</a></span></dt><dt><span class="section"><a href="index.html#_why_are_the_session_variables_not_set">4.2. Why are the session variables not set?</a></span></dt><dt><span class="section"><a href="index.html#_how_do_set_up_a_configuration_for_multiple_users_machines">4.3. How do set up a configuration for multiple users/machines?</a></span></dt><dt><span class="section"><a href="index.html#_why_do_i_get_an_error_message_about_literal_ca_desrt_dconf_literal">4.4. Why do I get an error message about <code class="literal">ca.desrt.dconf</code>?</a></span></dt><dt><span class="section"><a href="index.html#_how_do_i_install_packages_from_nixpkgs_unstable">4.5. How do I install packages from Nixpkgs unstable?</a></span></dt><dt><span class="section"><a href="index.html#_how_do_i_override_the_package_used_by_a_module">4.6. How do I override the package used by a module?</a></span></dt></dl></dd><dt><span class="appendix"><a href="options.html">A. Configuration Options</a></span></dt><dt><span class="appendix"><a href="nixos-options.html">B. NixOS Module Options</a></span></dt><dt><span class="appendix"><a href="nix-darwin-options.html">C. nix-darwin Module Options</a></span></dt><dt><span class="appendix"><a href="tools.html">D. Tools</a></span></dt><dd><dl><dt><span class="refentrytitle"><a href="tools.html#idm140737311928896"><span class="command"><strong>home-manager</strong></span>
+  </a></span><span class="refpurpose"> — reconfigure a user environment</span></dt></dl></dd><dt><span class="appendix"><a href="release-notes.html">E. Release Notes</a></span></dt><dd><dl><dt><span class="section"><a href="release-notes.html#sec-release-21.03">E.1. Release 21.03</a></span></dt><dd><dl><dt><span class="section"><a href="release-notes.html#sec-release-21.03-highlights">E.1.1. Highlights</a></span></dt><dt><span class="section"><a href="release-notes.html#sec-release-21.03-state-version-changes">E.1.2. State Version Changes</a></span></dt></dl></dd><dt><span class="section"><a href="release-notes.html#sec-release-20.09">E.2. Release 20.09</a></span></dt><dd><dl><dt><span class="section"><a href="release-notes.html#sec-release-20.09-highlights">E.2.1. Highlights</a></span></dt><dt><span class="section"><a href="release-notes.html#sec-release-20.09-state-version-changes">E.2.2. State Version Changes</a></span></dt></dl></dd><dt><span class="section"><a href="release-notes.html#sec-release-20.03">E.3. Release 20.03</a></span></dt><dd><dl><dt><span class="section"><a href="release-notes.html#sec-release-20.03-highlights">E.3.1. Highlights</a></span></dt><dt><span class="section"><a href="release-notes.html#sec-release-20.03-state-version-changes">E.3.2. State Version Changes</a></span></dt></dl></dd><dt><span class="section"><a href="release-notes.html#sec-release-19.09">E.4. Release 19.09</a></span></dt><dd><dl><dt><span class="section"><a href="release-notes.html#sec-release-19.09-highlights">E.4.1. Highlights</a></span></dt><dt><span class="section"><a href="release-notes.html#sec-release-19.09-state-version-changes">E.4.2. State Version Changes</a></span></dt></dl></dd><dt><span class="section"><a href="release-notes.html#sec-release-19.03">E.5. Release 19.03</a></span></dt><dd><dl><dt><span class="section"><a href="release-notes.html#sec-release-19.03-highlights">E.5.1. Highlights</a></span></dt><dt><span class="section"><a href="release-notes.html#sec-release-19.03-state-version-changes">E.5.2. State Version Changes</a></span></dt></dl></dd><dt><span class="section"><a href="release-notes.html#sec-release-18.09">E.6. Release 18.09</a></span></dt></dl></dd></dl></div><div class="preface"><div class="titlepage"><div><div><h1 class="title"><a id="idm140737328863552"></a>Preface</h1></div></div></div><p>
    This manual will eventually describes how to install, use, and extend Home
    Manager.
   </p><p>
diff --git a/options.html b/options.html
index 20e234a71..7e625a946 100644
--- a/options.html
+++ b/options.html
@@ -2765,6 +2765,10 @@ initialisation.
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.fzf.enableZshIntegration"></a><a class="term" href="options.html#opt-programs.fzf.enableZshIntegration"><code class="option">programs.fzf.enableZshIntegration</code></a></span></dt><dd><p>Whether to enable Zsh integration.
 </p><p><span class="emphasis"><em>Type:</em></span> boolean</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">
         true
+      </code></p><p><span class="emphasis"><em>Declared by:</em></span></p><table border="0" summary="Simple list" class="simplelist"><tr><td><code class="filename"><a class="filename" href="https://github.com/nix-community/home-manager/blob/master/modules/programs/fzf.nix#blob-path" target="_top">
+                    &lt;home-manager/modules/programs/fzf.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.fzf.package"></a><a class="term" href="options.html#opt-programs.fzf.package"><code class="option">programs.fzf.package</code></a></span></dt><dd><p>Package providing the <span class="command"><strong>fzf</strong></span> tool.</p><p><span class="emphasis"><em>Type:</em></span> package</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">
+        pkgs.fzf
       </code></p><p><span class="emphasis"><em>Declared by:</em></span></p><table border="0" summary="Simple list" class="simplelist"><tr><td><code class="filename"><a class="filename" href="https://github.com/nix-community/home-manager/blob/master/modules/programs/fzf.nix#blob-path" target="_top">
                     &lt;home-manager/modules/programs/fzf.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.fzf.changeDirWidgetCommand"></a><a class="term" href="options.html#opt-programs.fzf.changeDirWidgetCommand"><code class="option">programs.fzf.changeDirWidgetCommand</code></a></span></dt><dd><p>The command that gets executed as the source for fzf for the
diff --git a/tools.html b/tools.html
index 0390dcbdd..6ff7ae18f 100644
--- a/tools.html
+++ b/tools.html
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Appendix D. Tools</title><link rel="stylesheet" type="text/css" href="style.css" /><link rel="stylesheet" type="text/css" href="overrides.css" /><link rel="stylesheet" type="text/css" href="mono-blue.css" /><script src="highlight.pack.js" type="text/javascript"></script><script src="highlight.load.js" type="text/javascript"></script><meta name="generator" content="DocBook XSL Stylesheets V1.79.2" /><link rel="home" href="index.html" title="Home Manager Manual" /><link rel="up" href="index.html" title="Home Manager Manual" /><link rel="prev" href="nix-darwin-options.html" title="Appendix C. nix-darwin Module Options" /><link rel="next" href="release-notes.html" title="Appendix E. Release Notes" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Appendix D. Tools</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="nix-darwin-options.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="release-notes.html">Next</a></td></tr></table><hr /></div><div class="appendix"><div class="titlepage"><div><div><h1 class="title"><a id="ch-tools"></a>Appendix D. Tools</h1></div></div></div><div class="toc"><dl class="toc"><dt><span class="refentrytitle"><a href="tools.html#idm140737311928992"><span class="command"><strong>home-manager</strong></span>
-  </a></span><span class="refpurpose"> — reconfigure a user environment</span></dt></dl></div><div class="refentry"><a id="idm140737311928992"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p><span class="command"><strong>home-manager</strong></span>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Appendix D. Tools</title><link rel="stylesheet" type="text/css" href="style.css" /><link rel="stylesheet" type="text/css" href="overrides.css" /><link rel="stylesheet" type="text/css" href="mono-blue.css" /><script src="highlight.pack.js" type="text/javascript"></script><script src="highlight.load.js" type="text/javascript"></script><meta name="generator" content="DocBook XSL Stylesheets V1.79.2" /><link rel="home" href="index.html" title="Home Manager Manual" /><link rel="up" href="index.html" title="Home Manager Manual" /><link rel="prev" href="nix-darwin-options.html" title="Appendix C. nix-darwin Module Options" /><link rel="next" href="release-notes.html" title="Appendix E. Release Notes" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Appendix D. Tools</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="nix-darwin-options.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="release-notes.html">Next</a></td></tr></table><hr /></div><div class="appendix"><div class="titlepage"><div><div><h1 class="title"><a id="ch-tools"></a>Appendix D. Tools</h1></div></div></div><div class="toc"><dl class="toc"><dt><span class="refentrytitle"><a href="tools.html#idm140737311928896"><span class="command"><strong>home-manager</strong></span>
+  </a></span><span class="refpurpose"> — reconfigure a user environment</span></dt></dl></div><div class="refentry"><a id="idm140737311928896"></a><div class="titlepage"></div><div class="refnamediv"><h2>Name</h2><p><span class="command"><strong>home-manager</strong></span>
    — reconfigure a user environment</p></div><div class="refsynopsisdiv"><h2>Synopsis</h2><div class="cmdsynopsis"><p><code class="command">home-manager</code>  { 
     build
      |   
@@ -72,7 +72,7 @@
       |   
      --verbose
      }
-   ]</p></div></div><div class="refsection"><a id="idm140737311895296"></a><h2>Description</h2><p>
+   ]</p></div></div><div class="refsection"><a id="idm140737311895248"></a><h2>Description</h2><p>
    This command updates the user environment so that it corresponds to the
    configuration specified in <code class="filename">~/.config/nixpkgs/home.nix</code>.
   </p><p>
