diff --git a/options.xhtml b/options.xhtml
index a7934c5da..a02ce2933 100644
--- a/options.xhtml
+++ b/options.xhtml
@@ -13897,8 +13897,8 @@ list of (maintainer)</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="file:///nix/store/ng21zi7jrcaarargnfa04880s62mbzvv-source/modules/generic/meta-maintainers.nix" target="_top">
-/nix/store/ng21zi7jrcaarargnfa04880s62mbzvv-source/modules/generic/meta-maintainers.nix
+<code class="filename"><a class="filename"  href="file:///nix/store/x3zxarhzf3iimqc9n2q5md2wdp3jqxhc-source/modules/generic/meta-maintainers.nix" target="_top">
+/nix/store/x3zxarhzf3iimqc9n2q5md2wdp3jqxhc-source/modules/generic/meta-maintainers.nix
 </a></code>
 </td></tr>
 </table>
@@ -26919,8 +26919,8 @@ list of (maintainer)</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="file:///nix/store/ng21zi7jrcaarargnfa04880s62mbzvv-source/modules/generic/meta-maintainers.nix" target="_top">
-/nix/store/ng21zi7jrcaarargnfa04880s62mbzvv-source/modules/generic/meta-maintainers.nix
+<code class="filename"><a class="filename"  href="file:///nix/store/x3zxarhzf3iimqc9n2q5md2wdp3jqxhc-source/modules/generic/meta-maintainers.nix" target="_top">
+/nix/store/x3zxarhzf3iimqc9n2q5md2wdp3jqxhc-source/modules/generic/meta-maintainers.nix
 </a></code>
 </td></tr>
 </table>
@@ -27687,8 +27687,8 @@ list of (maintainer)</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="file:///nix/store/ng21zi7jrcaarargnfa04880s62mbzvv-source/modules/generic/meta-maintainers.nix" target="_top">
-/nix/store/ng21zi7jrcaarargnfa04880s62mbzvv-source/modules/generic/meta-maintainers.nix
+<code class="filename"><a class="filename"  href="file:///nix/store/x3zxarhzf3iimqc9n2q5md2wdp3jqxhc-source/modules/generic/meta-maintainers.nix" target="_top">
+/nix/store/x3zxarhzf3iimqc9n2q5md2wdp3jqxhc-source/modules/generic/meta-maintainers.nix
 </a></code>
 </td></tr>
 </table>
@@ -29242,8 +29242,8 @@ list of (maintainer)</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="file:///nix/store/ng21zi7jrcaarargnfa04880s62mbzvv-source/modules/generic/meta-maintainers.nix" target="_top">
-/nix/store/ng21zi7jrcaarargnfa04880s62mbzvv-source/modules/generic/meta-maintainers.nix
+<code class="filename"><a class="filename"  href="file:///nix/store/x3zxarhzf3iimqc9n2q5md2wdp3jqxhc-source/modules/generic/meta-maintainers.nix" target="_top">
+/nix/store/x3zxarhzf3iimqc9n2q5md2wdp3jqxhc-source/modules/generic/meta-maintainers.nix
 </a></code>
 </td></tr>
 </table>
@@ -30010,8 +30010,8 @@ list of (maintainer)</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="file:///nix/store/ng21zi7jrcaarargnfa04880s62mbzvv-source/modules/generic/meta-maintainers.nix" target="_top">
-/nix/store/ng21zi7jrcaarargnfa04880s62mbzvv-source/modules/generic/meta-maintainers.nix
+<code class="filename"><a class="filename"  href="file:///nix/store/x3zxarhzf3iimqc9n2q5md2wdp3jqxhc-source/modules/generic/meta-maintainers.nix" target="_top">
+/nix/store/x3zxarhzf3iimqc9n2q5md2wdp3jqxhc-source/modules/generic/meta-maintainers.nix
 </a></code>
 </td></tr>
 </table>
@@ -34871,7 +34871,7 @@ boolean</p>
 <p>The go package to use.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
-package</p>
+null or package</p>
 
 <p><span class="emphasis"><em>Default:</em></span>
 <code class="literal">pkgs.go</code></p>
@@ -34918,24 +34918,39 @@ attribute set of absolute path</p>
 </dd>
 <dt>
  <span class="term">
- <a id="opt-programs.go.extraGoPaths"></a><a class="term" href="options.xhtml#opt-programs.go.extraGoPaths"><code class="option">programs.go.extraGoPaths</code>
+ <a id="opt-programs.go.env"></a><a class="term" href="options.xhtml#opt-programs.go.env"><code class="option">programs.go.env</code>
   </a>
  </span>
 </dt>
 <dd>
-<p>Extra <code class="envar">GOPATH</code>s relative to <code class="envar">HOME</code> appended
-after <a class="xref" href="options.xhtml#opt-programs.go.goPath"  ><code class="option">programs.go.goPath</code></a>, if that option is set.</p>
+<p>Environment variables for Go. All the available options
+can be found running ‘go env’.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
-list of string</p>
+attribute set of string</p>
 
 <p><span class="emphasis"><em>Default:</em></span>
-<code class="literal">[ ]</code></p>
+<code class="literal">{ }</code></p>
+
+<p><span class="emphasis"><em>Example:</em></span></p><pre><code class="programlisting">{
+  GOPATH = [
+    &quot;${config.home.homeDirectory}/mygo&quot;
+    &quot;/another/go&quot;
+    &quot;/yet/another/go&quot;
+  ];
+
+  GOPRIVATE = [
+    &quot;*.corp.example.com&quot;
+    &quot;rsc.io/private&quot;
+  ];
+
+  CXX = &quot;g++&quot;;
+  GCCGO = &quot;gccgo&quot;;
+  GOAMD64 = &quot;v1&quot;;
+  GOARCH = &quot;amd64&quot;;
+  GOAUTH = &quot;netrc&quot;;
+};
 
-<p><span class="emphasis"><em>Example:</em></span></p><pre><code class="programlisting">[
-  &quot;extraGoPath1&quot;
-  &quot;extraGoPath2&quot;
-]
 </code></pre>
 
 <p><span class="emphasis"><em>Declared by:</em></span></p>
@@ -34949,21 +34964,18 @@ list of string</p>
 </dd>
 <dt>
  <span class="term">
- <a id="opt-programs.go.goBin"></a><a class="term" href="options.xhtml#opt-programs.go.goBin"><code class="option">programs.go.goBin</code>
+ <a id="opt-programs.go.env.GOPATH"></a><a class="term" href="options.xhtml#opt-programs.go.env.GOPATH"><code class="option">programs.go.env.GOPATH</code>
   </a>
  </span>
 </dt>
 <dd>
-<p>GOBIN relative to HOME</p>
+<p>List of directories that should be used by the Go tooling.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
-null or string</p>
+string or list of string</p>
 
 <p><span class="emphasis"><em>Default:</em></span>
-<code class="literal">null</code></p>
-
-<p><span class="emphasis"><em>Example:</em></span>
-<code class="literal">&quot;.local/bin.go&quot;</code></p>
+<code class="literal">&quot;&quot;</code></p>
 
 <p><span class="emphasis"><em>Declared by:</em></span></p>
 <table border="0" summary="Simple list" class="simplelist">
@@ -34976,56 +34988,19 @@ null or string</p>
 </dd>
 <dt>
  <span class="term">
- <a id="opt-programs.go.goPath"></a><a class="term" href="options.xhtml#opt-programs.go.goPath"><code class="option">programs.go.goPath</code>
+ <a id="opt-programs.go.env.GOPRIVATE"></a><a class="term" href="options.xhtml#opt-programs.go.env.GOPRIVATE"><code class="option">programs.go.env.GOPRIVATE</code>
   </a>
  </span>
 </dt>
 <dd>
-<p>Primary <code class="envar">GOPATH</code> relative to
-<code class="envar">HOME</code>. It will be exported first and therefore
-used by default by the Go tooling.</p>
+<p>Controls which modules the ‘go’ command considers to be private (not
+available publicly) and should therefore not use the proxy or checksum database.</p>
 
 <p><span class="emphasis"><em>Type:</em></span>
-null or string</p>
+string or list of string</p>
 
 <p><span class="emphasis"><em>Default:</em></span>
-<code class="literal">null</code></p>
-
-<p><span class="emphasis"><em>Example:</em></span>
-<code class="literal">&quot;go&quot;</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/go.nix" target="_top">
-&lt;home-manager/modules/programs/go.nix&gt;
-</a></code>
-</td></tr>
-</table>
-</dd>
-<dt>
- <span class="term">
- <a id="opt-programs.go.goPrivate"></a><a class="term" href="options.xhtml#opt-programs.go.goPrivate"><code class="option">programs.go.goPrivate</code>
-  </a>
- </span>
-</dt>
-<dd>
-<p>The <code class="envar">GOPRIVATE</code> environment variable controls
-which modules the go command considers to be private (not
-available publicly) and should therefore not use the proxy
-or checksum database.</p>
-
-<p><span class="emphasis"><em>Type:</em></span>
-list of string</p>
-
-<p><span class="emphasis"><em>Default:</em></span>
-<code class="literal">[ ]</code></p>
-
-<p><span class="emphasis"><em>Example:</em></span></p><pre><code class="programlisting">[
-  &quot;*.corp.example.com&quot;
-  &quot;rsc.io/private&quot;
-]
-</code></pre>
+<code class="literal">&quot;&quot;</code></p>
 
 <p><span class="emphasis"><em>Declared by:</em></span></p>
 <table border="0" summary="Simple list" class="simplelist">
@@ -45999,8 +45974,8 @@ list of (maintainer)</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="file:///nix/store/ng21zi7jrcaarargnfa04880s62mbzvv-source/modules/generic/meta-maintainers.nix" target="_top">
-/nix/store/ng21zi7jrcaarargnfa04880s62mbzvv-source/modules/generic/meta-maintainers.nix
+<code class="filename"><a class="filename"  href="file:///nix/store/x3zxarhzf3iimqc9n2q5md2wdp3jqxhc-source/modules/generic/meta-maintainers.nix" target="_top">
+/nix/store/x3zxarhzf3iimqc9n2q5md2wdp3jqxhc-source/modules/generic/meta-maintainers.nix
 </a></code>
 </td></tr>
 </table>
@@ -46767,8 +46742,8 @@ list of (maintainer)</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="file:///nix/store/ng21zi7jrcaarargnfa04880s62mbzvv-source/modules/generic/meta-maintainers.nix" target="_top">
-/nix/store/ng21zi7jrcaarargnfa04880s62mbzvv-source/modules/generic/meta-maintainers.nix
+<code class="filename"><a class="filename"  href="file:///nix/store/x3zxarhzf3iimqc9n2q5md2wdp3jqxhc-source/modules/generic/meta-maintainers.nix" target="_top">
+/nix/store/x3zxarhzf3iimqc9n2q5md2wdp3jqxhc-source/modules/generic/meta-maintainers.nix
 </a></code>
 </td></tr>
 </table>
@@ -71965,8 +71940,8 @@ list of (maintainer)</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="file:///nix/store/ng21zi7jrcaarargnfa04880s62mbzvv-source/modules/generic/meta-maintainers.nix" target="_top">
-/nix/store/ng21zi7jrcaarargnfa04880s62mbzvv-source/modules/generic/meta-maintainers.nix
+<code class="filename"><a class="filename"  href="file:///nix/store/x3zxarhzf3iimqc9n2q5md2wdp3jqxhc-source/modules/generic/meta-maintainers.nix" target="_top">
+/nix/store/x3zxarhzf3iimqc9n2q5md2wdp3jqxhc-source/modules/generic/meta-maintainers.nix
 </a></code>
 </td></tr>
 </table>