diff --git a/options.html b/options.html
index 47b905b0e..3f9d1cbb0 100644
--- a/options.html
+++ b/options.html
@@ -4023,6 +4023,50 @@ supported plugins run:
   "id_rsa"
 ]</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/keychain.nix#blob-path" target="_top">
                     &lt;home-manager/modules/programs/keychain.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.khal.enable"></a><a class="term" href="options.html#opt-programs.khal.enable"><code class="option">programs.khal.enable</code></a></span></dt><dd><p>Whether to enable khal, a CLI calendar application.</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/khal.nix#blob-path" target="_top">
+                    &lt;home-manager/modules/programs/khal.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.khal.locale"></a><a class="term" href="options.html#opt-programs.khal.locale"><code class="option">programs.khal.locale</code></a></span></dt><dd><p>khal locale settings.</p><p><span class="emphasis"><em>Type:</em></span> submodule</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/khal.nix#blob-path" target="_top">
+                    &lt;home-manager/modules/programs/khal.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.khal.locale.dateformat"></a><a class="term" href="options.html#opt-programs.khal.locale.dateformat"><code class="option">programs.khal.locale.dateformat</code></a></span></dt><dd><p>khal will display and understand all dates in this format.
+
+Format strings are for python 'strftime', similarly to man 3 strftime.</p><p><span class="emphasis"><em>Type:</em></span> string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"%x"</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/khal.nix#blob-path" target="_top">
+                    &lt;home-manager/modules/programs/khal.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.khal.locale.datetimeformat"></a><a class="term" href="options.html#opt-programs.khal.locale.datetimeformat"><code class="option">programs.khal.locale.datetimeformat</code></a></span></dt><dd><p>khal will display and understand all datetimes in this format.
+
+Format strings are for python 'strftime', similarly to man 3 strftime.</p><p><span class="emphasis"><em>Type:</em></span> string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"%c"</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/khal.nix#blob-path" target="_top">
+                    &lt;home-manager/modules/programs/khal.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.khal.locale.default_timezone"></a><a class="term" href="options.html#opt-programs.khal.locale.default_timezone"><code class="option">programs.khal.locale.default_timezone</code></a></span></dt><dd><p>Default for new events or if khal does not understand the timezone
+in an ical file.
+If 'null', the timezone of your computer will be used.</p><p><span class="emphasis"><em>Type:</em></span> null or string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">null</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/khal.nix#blob-path" target="_top">
+                    &lt;home-manager/modules/programs/khal.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.khal.locale.firstweekday"></a><a class="term" href="options.html#opt-programs.khal.locale.firstweekday"><code class="option">programs.khal.locale.firstweekday</code></a></span></dt><dd><p>the first day of the week, where Monday is 0 and Sunday is 6</p><p><span class="emphasis"><em>Type:</em></span> integer between 0 and 6 (both inclusive)</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">0</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/khal.nix#blob-path" target="_top">
+                    &lt;home-manager/modules/programs/khal.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.khal.locale.local_timezone"></a><a class="term" href="options.html#opt-programs.khal.locale.local_timezone"><code class="option">programs.khal.locale.local_timezone</code></a></span></dt><dd><p>khal will show all times in this timezone.
+If 'null', the timezone of your computer will be used.</p><p><span class="emphasis"><em>Type:</em></span> null or string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">null</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/khal.nix#blob-path" target="_top">
+                    &lt;home-manager/modules/programs/khal.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.khal.locale.longdateformat"></a><a class="term" href="options.html#opt-programs.khal.locale.longdateformat"><code class="option">programs.khal.locale.longdateformat</code></a></span></dt><dd><p>khal will display and understand all dates in this format.
+It should contain a year (e.g. %Y).
+
+Format strings are for python 'strftime', similarly to man 3 strftime.</p><p><span class="emphasis"><em>Type:</em></span> string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"%x"</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/khal.nix#blob-path" target="_top">
+                    &lt;home-manager/modules/programs/khal.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.khal.locale.longdatetimeformat"></a><a class="term" href="options.html#opt-programs.khal.locale.longdatetimeformat"><code class="option">programs.khal.locale.longdatetimeformat</code></a></span></dt><dd><p>khal will display and understand all datetimes in this format.
+It should contain a year (e.g. %Y).
+
+Format strings are for python 'strftime', similarly to man 3 strftime.</p><p><span class="emphasis"><em>Type:</em></span> string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"%c"</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/khal.nix#blob-path" target="_top">
+                    &lt;home-manager/modules/programs/khal.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.khal.locale.timeformat"></a><a class="term" href="options.html#opt-programs.khal.locale.timeformat"><code class="option">programs.khal.locale.timeformat</code></a></span></dt><dd><p>khal will display and understand all times in this format.
+
+Format strings are for python 'strftime', similarly to man 3 strftime.</p><p><span class="emphasis"><em>Type:</em></span> string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"%X"</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/khal.nix#blob-path" target="_top">
+                    &lt;home-manager/modules/programs/khal.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.khal.locale.unicode_symbols"></a><a class="term" href="options.html#opt-programs.khal.locale.unicode_symbols"><code class="option">programs.khal.locale.unicode_symbols</code></a></span></dt><dd><p>By default khal uses some unicode symbols (as in ‘non-ascii’) as
+indicators for things like repeating events.
+If your font, encoding etc. does not support those symbols, set this
+to false (this will enable ascii based replacements).</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/khal.nix#blob-path" target="_top">
+                    &lt;home-manager/modules/programs/khal.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.khal.locale.weeknumbers"></a><a class="term" href="options.html#opt-programs.khal.locale.weeknumbers"><code class="option">programs.khal.locale.weeknumbers</code></a></span></dt><dd><p>Enable weeknumbers in calendar and interactive (ikhal) mode.
+As those are iso weeknumbers, they only work properly if firstweekday
+is set to 0.</p><p><span class="emphasis"><em>Type:</em></span> one of "off", "left", "right"</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"off"</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/khal.nix#blob-path" target="_top">
+                    &lt;home-manager/modules/programs/khal.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.kitty.enable"></a><a class="term" href="options.html#opt-programs.kitty.enable"><code class="option">programs.kitty.enable</code></a></span></dt><dd><p>Whether to enable Kitty terminal emulator.</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/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.package"></a><a class="term" href="options.html#opt-programs.kitty.package"><code class="option">programs.kitty.package</code></a></span></dt><dd><p>Kitty package to install.</p><p><span class="emphasis"><em>Type:</em></span> package</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">pkgs.kitty</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">
@@ -6499,6 +6543,14 @@ for options.</p><p><span class="emphasis"><em>Type:</em></span> attribute set of
                     &lt;home-manager/modules/programs/urxvt.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.urxvt.transparent"></a><a class="term" href="options.html#opt-programs.urxvt.transparent"><code class="option">programs.urxvt.transparent</code></a></span></dt><dd><p>Whether to enable pseudo-transparency.</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>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/urxvt.nix#blob-path" target="_top">
                     &lt;home-manager/modules/programs/urxvt.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.vdirsyncer.enable"></a><a class="term" href="options.html#opt-programs.vdirsyncer.enable"><code class="option">programs.vdirsyncer.enable</code></a></span></dt><dd><p>Whether to enable vdirsyncer.</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/vdirsyncer.nix#blob-path" target="_top">
+                    &lt;home-manager/modules/programs/vdirsyncer.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.vdirsyncer.package"></a><a class="term" href="options.html#opt-programs.vdirsyncer.package"><code class="option">programs.vdirsyncer.package</code></a></span></dt><dd><p>vdirsyncer package to use.</p><p><span class="emphasis"><em>Type:</em></span> package</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"pkgs.vdirsyncer"</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/vdirsyncer.nix#blob-path" target="_top">
+                    &lt;home-manager/modules/programs/vdirsyncer.nix&gt;
+                </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.vdirsyncer.statusPath"></a><a class="term" href="options.html#opt-programs.vdirsyncer.statusPath"><code class="option">programs.vdirsyncer.statusPath</code></a></span></dt><dd><p>A directory where vdirsyncer will store some additional data for the next sync.
+</p><p>For more information, see
+<a class="link" href="https://vdirsyncer.pimutils.org/en/stable/config.html#general-section" target="_top">https://vdirsyncer.pimutils.org/en/stable/config.html#general-section</a></p><p><span class="emphasis"><em>Type:</em></span> string</p><p><span class="emphasis"><em>Default:</em></span> <code class="literal">"$XDG_DATA_HOME/vdirsyncer/status"</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/vdirsyncer.nix#blob-path" target="_top">
+                    &lt;home-manager/modules/programs/vdirsyncer.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.vim.enable"></a><a class="term" href="options.html#opt-programs.vim.enable"><code class="option">programs.vim.enable</code></a></span></dt><dd><p>Whether to enable Vim.</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/vim.nix#blob-path" target="_top">
                     &lt;home-manager/modules/programs/vim.nix&gt;
                 </a></code></td></tr></table></dd><dt><span class="term"><a id="opt-programs.vim.package"></a><a class="term" href="options.html#opt-programs.vim.package"><code class="option">programs.vim.package</code></a></span></dt><dd><p>Resulting customized vim package</p><p><span class="emphasis"><em>Type:</em></span> package <span class="emphasis"><em>(read only)</em></span></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/vim.nix#blob-path" target="_top">