diff --git a/options.html b/options.html
index fd9289466..06f00348e 100644
--- a/options.html
+++ b/options.html
@@ -1947,9 +1947,9 @@ Can be used to specify extensions.</p><p><span class="emphasis"><em>Type:</em></
                     &lt;home-manager/modules/programs/beets.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.beets.mpdIntegration.enableUpdate"></a><a class="term" href="options.html#opt-programs.beets.mpdIntegration.enableUpdate"><code class="option">programs.beets.mpdIntegration.enableUpdate</code></a></span></dt><dd><p>Whether to enable mpdupdate plugin.</p><p><span class="emphasis"><em>Type:</em></span> boolean</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">false</code></p><p><span class="emphasis"><em>Example:</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/beets.nix#blob-path" target="_top">
                     &lt;home-manager/modules/programs/beets.nix&gt;
-                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.beets.mpdIntegration.host"></a><a class="term" href="options.html#opt-programs.beets.mpdIntegration.host"><code class="option">programs.beets.mpdIntegration.host</code></a></span></dt><dd><p>Host mpdstats will connect to</p><p><span class="emphasis"><em>Type:</em></span> string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"localhost"</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">"10.0.0.42"</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/beets.nix#blob-path" target="_top">
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.beets.mpdIntegration.host"></a><a class="term" href="options.html#opt-programs.beets.mpdIntegration.host"><code class="option">programs.beets.mpdIntegration.host</code></a></span></dt><dd><p>The host that mpdstats will connect to.</p><p><span class="emphasis"><em>Type:</em></span> string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"localhost"</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">"10.0.0.42"</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/beets.nix#blob-path" target="_top">
                     &lt;home-manager/modules/programs/beets.nix&gt;
-                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.beets.mpdIntegration.port"></a><a class="term" href="options.html#opt-programs.beets.mpdIntegration.port"><code class="option">programs.beets.mpdIntegration.port</code></a></span></dt><dd><p>Port mpdstats will connect to</p><p><span class="emphasis"><em>Type:</em></span> 16 bit unsigned integer; between 0 and 65535 (both inclusive)</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">config.services.mpd.network.port</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">6601</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/beets.nix#blob-path" target="_top">
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.beets.mpdIntegration.port"></a><a class="term" href="options.html#opt-programs.beets.mpdIntegration.port"><code class="option">programs.beets.mpdIntegration.port</code></a></span></dt><dd><p>The port that mpdstats will connect to.</p><p><span class="emphasis"><em>Type:</em></span> 16 bit unsigned integer; between 0 and 65535 (both inclusive)</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">config.services.mpd.network.port</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">6601</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/beets.nix#blob-path" target="_top">
                     &lt;home-manager/modules/programs/beets.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.beets.settings"></a><a class="term" href="options.html#opt-programs.beets.settings"><code class="option">programs.beets.settings</code></a></span></dt><dd><p>Configuration written to
 <code class="filename">$XDG_CONFIG_HOME/beets/config.yaml</code></p><p><span class="emphasis"><em>Type:</em></span> YAML value</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">{ }</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/beets.nix#blob-path" target="_top">
@@ -3967,18 +3967,18 @@ for the documentation.</p><p><span class="emphasis"><em>Type:</em></span> attrib
 }
 </pre><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/kitty.nix#blob-path" target="_top">
                     &lt;home-manager/modules/programs/kitty.nix&gt;
-                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.kitty.shellIntegration.enableBashIntegration"></a><a class="term" href="options.html#opt-programs.kitty.shellIntegration.enableBashIntegration"><code class="option">programs.kitty.shellIntegration.enableBashIntegration</code></a></span></dt><dd><p>Whether to enable Kitty bash integration.</p><p><span class="emphasis"><em>Type:</em></span> boolean</p><p><span class="emphasis"><em>Default:</em></span> </p><pre class="programlisting">config.programs.kitty.shellIntegration.mode != "disabled"
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.kitty.shellIntegration.enableBashIntegration"></a><a class="term" href="options.html#opt-programs.kitty.shellIntegration.enableBashIntegration"><code class="option">programs.kitty.shellIntegration.enableBashIntegration</code></a></span></dt><dd><p>Whether to enable Kitty Bash integration.</p><p><span class="emphasis"><em>Type:</em></span> boolean</p><p><span class="emphasis"><em>Default:</em></span> </p><pre class="programlisting">config.programs.kitty.shellIntegration.mode != "disabled"
 </pre><p><span class="emphasis"><em>Example:</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/kitty.nix#blob-path" target="_top">
                     &lt;home-manager/modules/programs/kitty.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.kitty.shellIntegration.enableFishIntegration"></a><a class="term" href="options.html#opt-programs.kitty.shellIntegration.enableFishIntegration"><code class="option">programs.kitty.shellIntegration.enableFishIntegration</code></a></span></dt><dd><p>Whether to enable Kitty fish integration.</p><p><span class="emphasis"><em>Type:</em></span> boolean</p><p><span class="emphasis"><em>Default:</em></span> </p><pre class="programlisting">config.programs.kitty.shellIntegration.mode != "disabled"
 </pre><p><span class="emphasis"><em>Example:</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/kitty.nix#blob-path" target="_top">
                     &lt;home-manager/modules/programs/kitty.nix&gt;
-                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.kitty.shellIntegration.enableZshIntegration"></a><a class="term" href="options.html#opt-programs.kitty.shellIntegration.enableZshIntegration"><code class="option">programs.kitty.shellIntegration.enableZshIntegration</code></a></span></dt><dd><p>Whether to enable Kitty zsh integration.</p><p><span class="emphasis"><em>Type:</em></span> boolean</p><p><span class="emphasis"><em>Default:</em></span> </p><pre class="programlisting">config.programs.kitty.shellIntegration.mode != "disabled"
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.kitty.shellIntegration.enableZshIntegration"></a><a class="term" href="options.html#opt-programs.kitty.shellIntegration.enableZshIntegration"><code class="option">programs.kitty.shellIntegration.enableZshIntegration</code></a></span></dt><dd><p>Whether to enable Kitty Z Shell integration.</p><p><span class="emphasis"><em>Type:</em></span> boolean</p><p><span class="emphasis"><em>Default:</em></span> </p><pre class="programlisting">config.programs.kitty.shellIntegration.mode != "disabled"
 </pre><p><span class="emphasis"><em>Example:</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/kitty.nix#blob-path" target="_top">
                     &lt;home-manager/modules/programs/kitty.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.kitty.shellIntegration.mode"></a><a class="term" href="options.html#opt-programs.kitty.shellIntegration.mode"><code class="option">programs.kitty.shellIntegration.mode</code></a></span></dt><dd><p>Set the mode of the shell integration. This accepts the same options
-as the shell_integration option of Kitty. Note that no-rc is always
-implied. See
+as the <code class="literal">shell_integration</code> option of Kitty. Note that
+<code class="literal">no-rc</code> is always implied. See
 <a class="link" href="https://sw.kovidgoyal.net/kitty/shell-integration" target="_top">https://sw.kovidgoyal.net/kitty/shell-integration</a>
 for more details.</p><p><span class="emphasis"><em>Type:</em></span> string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"enabled"</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">"no-cursor"</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/kitty.nix#blob-path" target="_top">
                     &lt;home-manager/modules/programs/kitty.nix&gt;
@@ -7406,7 +7406,11 @@ editor using the <code class="envar">EDITOR</code> environment variable.</p><p><
                     &lt;home-manager/modules/services/emacs.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-services.emacs.socketActivation.enable"></a><a class="term" href="options.html#opt-services.emacs.socketActivation.enable"><code class="option">services.emacs.socketActivation.enable</code></a></span></dt><dd><p>Whether to enable systemd socket activation for the Emacs service.</p><p><span class="emphasis"><em>Type:</em></span> boolean</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">false</code></p><p><span class="emphasis"><em>Example:</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/services/emacs.nix#blob-path" target="_top">
                     &lt;home-manager/modules/services/emacs.nix&gt;
-                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-services.emacs.startWithUserSession"></a><a class="term" href="options.html#opt-services.emacs.startWithUserSession"><code class="option">services.emacs.startWithUserSession</code></a></span></dt><dd><p>Whether to launch Emacs service with the systemd user session.  If it is <code class="literal">true</code>, Emacs service is started by default.target.  If it is <code class="literal">"graphical"</code>, Emacs service is started by graphical-session.target.</p><p><span class="emphasis"><em>Type:</em></span> boolean or value "graphical" (singular enum)</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">!config.services.emacs.socketActivation.enable</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">"graphical"</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/services/emacs.nix#blob-path" target="_top">
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-services.emacs.startWithUserSession"></a><a class="term" href="options.html#opt-services.emacs.startWithUserSession"><code class="option">services.emacs.startWithUserSession</code></a></span></dt><dd><p>Whether to launch Emacs service with the systemd user session. If it is
+<code class="literal">true</code>, Emacs service is started by
+<code class="literal">default.target</code>. If it is
+<code class="literal">"graphical"</code>, Emacs service is started by
+<code class="literal">graphical-session.target</code>.</p><p><span class="emphasis"><em>Type:</em></span> boolean or value "graphical" (singular enum)</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">!config.services.emacs.socketActivation.enable</code></p><p><span class="emphasis"><em>Example:</em></span> <code class="literal">"graphical"</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/services/emacs.nix#blob-path" target="_top">
                     &lt;home-manager/modules/services/emacs.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-services.espanso.enable"></a><a class="term" href="options.html#opt-services.espanso.enable"><code class="option">services.espanso.enable</code></a></span></dt><dd><p>Whether to enable Espanso: cross platform text expander in Rust.</p><p><span class="emphasis"><em>Type:</em></span> boolean</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">false</code></p><p><span class="emphasis"><em>Example:</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/services/espanso.nix#blob-path" target="_top">
                     &lt;home-manager/modules/services/espanso.nix&gt;