NixOS · Mar 19, 2020 · Mar 19, 2020 · Mar 24, 2020 · Mar 25, 2020 · Mar 25, 2020
diff --git a/.envrc b/.envrc
@@ -0,0 +1 @@
+use nix
diff --git a/.gitignore b/.gitignore
@@ -3,19 +3,20 @@
 
 /nixos/manual/
 /nixos/nix-pills/
-/nixos/options.json
 /nixos/screenshots/nixos-*-small.png
 /nixos/packages-explorer.js
 
 /nixpkgs/manual/
-/nixpkgs/*.json
+/nixpkgs/packages-channels.json
 
 /nix/manual/
 
 /blogs.json
 /blogs.xml
 /favicon.png
+/favicon.ico
 /news-rss.xml
 /nixos-release.tt
+/robots.txt
 
 /result*
diff --git a/Makefile b/Makefile
@@ -1,18 +1,16 @@
 NIXOS_SERIES = 19.09
-NIXPKGS_STABLE ?= /no-such-path
-NIXPKGS_UNSTABLE ?= /no-such-path
+ROOT = "/"
 
 rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d))
 
 default: all
 
 
-HTML = index.html news.html learn.html \
-  nix/index.html nix/about.html nix/download.html \
-  nixpkgs/index.html nixpkgs/download.html \
-  nixos/index.html nixos/about.html nixos/download.html \
+HTML = index.html download.html news.html learn.html governance.html \
+  teams/rfc-steering-committee.html teams/security.html teams/marketing.html \
+  teams/nixos_release.html teams/infrastructure.html teams/nixcon.html \
+  teams/discourse.html \
   nixos/community.html nixos/packages.html nixos/options.html \
-  nixos/security.html nixos/foundation.html \
   nixos/wiki.html \
   404.html
 
@@ -62,24 +60,30 @@ $(NIXPKGS_MANUAL_OUT): $(NIXPKGS_MANUAL_IN) bootstrapify-docbook.sh bootstrapify
 	bash ./bootstrapify-docbook.sh $(NIXPKGS_MANUAL_IN)/share/doc/nixpkgs $(NIXPKGS_MANUAL_OUT) 'Nixpkgs manual' nixpkgs https://github.com/NixOS/nixpkgs/tree/master/doc
 	ln -sfn manual.html $(NIXPKGS_MANUAL_OUT)/index.html
 
-all: $(HTML) favicon.png $(subst .png,-small.png,$(filter-out %-small.png,$(wildcard nixos/screenshots/*))) \
+
+all: $(HTML) favicon.png favicon.ico robots.txt $(subst .png,-small.png,$(filter-out %-small.png,$(wildcard nixos/screenshots/*))) \
   nixos/packages-explorer.js \
-  nixpkgs/packages-channels.json \
-  nixpkgs/packages-nixos-$(NIXOS_SERIES).json \
-  nixpkgs/packages-nixpkgs-unstable.json \
-  nixos/options.json
+  nixpkgs/packages-channels.json
+
 
+robots.txt: $(HTML)
+	echo "Users-agent: *" >> $@
+	#echo "Disallow: /" >> $@
+	#for page in $(HTML); do echo "Allow: /$$page" >> $@; done
 
 favicon.png: logo/nixos-logo-only-hires.png
 	convert -resize 16x16 -background none -gravity center -extent 16x16 $< $@
 
+favicon.ico: favicon.png
+	convert -resize x16 -gravity center -crop 16x16+0+0 -flatten -colors 256 -background transparent $< $@
+
 %-small.png: %.png
 	convert -resize 200 $< $@
 
 %.html: %.tt layout.tt common.tt nix-release.tt nixos-release.tt donation.tt
 	tpage \
 	  --pre_chomp --post_chomp \
-	  --define root=`echo $@ | sed -e 's|[^/]||g' -e 's|/|../|g'` \
+	  --define root=$(ROOT) \
 	  --define fileName=$< \
 	  --define nixosAmis=$(NIXOS_AMIS) \
 	  --define nixosAzureBlobs=$(NIXOS_AZURE_BLOBS) \
@@ -133,28 +137,11 @@ update: blogs.xml nixos-release.tt
 endif
 
 
-.PHONY: nixpkgs/packages-nixos-$(NIXOS_SERIES).json
-
-nixpkgs/packages-nixos-$(NIXOS_SERIES).json:
-	@ln -sfn $(NIXPKGS_STABLE)/packages.json $@
-
-.PHONY: nixpkgs/packages-nixpkgs-unstable.json
-
-nixpkgs/packages-nixpkgs-unstable.json:
-	@ln -sfn $(NIXPKGS_UNSTABLE)/packages.json $@
-
-NIXOS_OPTIONS ?= /no-such-path
-
-.PHONY: nixos/options.json
-
 # Cute hack, this allows future expansion if desired
 # Mainly, this allows tracking NIXOS_SERIES
 nixpkgs/packages-channels.json: Makefile
 	echo '["nixos-$(NIXOS_SERIES)", "nixpkgs-unstable"]' > $@
 
-nixos/options.json:
-	@ln -sfn $(NIXOS_OPTIONS) $@
-
 nixos/packages-explorer.js:
 	@ln -sfn $(PACKAGES_EXPLORER) $@
 
diff --git a/css/nixos-site.css b/css/nixos-site.css
@@ -187,6 +187,24 @@ div.main li {
     margin-bottom: 0.5em;
 }
 
+div.main .nav li {
+    margin-bottom: -1px;
+}
+
+div.main .nav {
+  margin-bottom: 0;
+}
+
+div.main .tab-content {
+  border: 1px solid #ddd;
+  border-top: 0;
+  padding: 1em;
+}
+
+div.main .tab-content .row {
+  margin: 1em;
+}
+
 /* Inline (floating) images. */
 img.inline {
     float: right;

diff --git a/download.tt b/download.tt
@@ -0,0 +1,339 @@
+[% WRAPPER layout.tt title="Getting Nix / NixOS" hideTitle=1 menu='nixos' %]
+[% USE IO.All %]
+[% USE JSON.Escape %]
+
+<h1>Getting Nix</h1>
+
+<p class="lead">
+  Below you will find installation instructions for Nix, the package manager.
+  Nix is currently supported on <strong>Linux</strong> and <strong>Mac</strong>.
+  The latest stable release is <strong>[%latestNixVersion%]</strong>
+</p>
+
+<ul id="getting-nix" class="nav nav-tabs">
+  <li class="active"><a href="#nix-quick-install">Quick install</a></li>
+  <li><a href="#nix-verify-installation">Verify installation (GPG)</a></li>
+  <li><a href="#nix-uninstall">Uninstall</a></li>
+  <li><a href="#nix-more">More ...</a></li>
+</ul>
+
+<div class="tab-content">
+  <section class="tab-pane active" id="nix-quick-install">
+    The quickest way to install Nix is to run the following in a shell (as a
+    user other than <code>root</code>):
+    <pre class="well" style="margin-top:1em">
+<span class="nix-command">curl -L --proto '=https' --tlsv1.2 https://nixos.org/nix/install | sh</span></pre>
+    <p>Make sure to follow the instructions output by the script.</p>
+    <p>The installation script requires that you have <code>sudo</code> access to <code>root</code>.</p>
+  </section>
+  <section class="tab-pane" id="nix-verify-installation">
+    <p>You may want to verify the integrity of the installation script using GPG:</p>
+    <pre class="well">
+<span class="nix-command">curl -o install-nix-[%latestNixVersion%] https://releases.nixos.org/nix/nix-[%latestNixVersion%]/install</span>
+<span class="nix-command">curl -o install-nix-[%latestNixVersion%].asc https://releases.nixos.org/nix/nix-[%latestNixVersion%]/install.asc</span>
+<span class="nix-command">gpg2 --recv-keys B541D55301270E0BCF15CA5D8170B4726D7198DE</span>
+<span class="nix-command">gpg2 --verify ./install-nix-[%latestNixVersion%].asc</span>
+<span class="nix-command">sh ./install-nix-[%latestNixVersion%]</span></pre>
+    <p>
+      The <a href="[%root%]edolstra.gpg">signing key</a> has fingerprint
+      <code>B541 D553 0127 0E0B CF15 CA5D 8170 B472 6D71 98DE</code>.
+      It is also available
+      <a href="https://github.com/NixOS/nixos-homepage/blob/master/edolstra.gpg">on GitHub</a>.
+    </p>
+  </section>
+  <section class="tab-pane" id="nix-uninstall">
+    <p>
+      You can uninstall Nix simply by running <code>rm -rf /nix</code>.
+    </p>
+    <!-- TODO: expand this https://github.com/NixOS/nix/issues/1402 -->
+  </section>
+  <section class="tab-pane" id="nix-more">
+    <p>See <a href="[%nixManual%]#chap-installation">the manual</a> for more information.</p>
+    <p>The following artifacts are also available:</p>
+    <ul>
+      <li><a href="[%latestNixMirror%]/nix-[%latestNixVersion%].tar.xz">Source tarball</a>.</li>
+      <li><a href="[%nixManual%]#ssec-relnotes-[%latestNixVersion%]">Release notes</a>.</li>
+      <li>
+        <a href="[%nixManual%]">Manual</a>.
+        Please read the <a href="[%nixManual%]#chap-quick-start">“Quick Start” section of the manual</a>
+        for an overview of how to install and use Nix.
+      </li>
+      <li>Old releases are <a href="/releases/nix">also available</a>.</li>
+    </ul>
+  </section>
+</div>
+
+<script charset="utf-8">
+  $('#getting-nix a').click(function (e) {
+    e.preventDefault();
+    $(this).tab('show');
+  })
+
+</script>
+
+
+<h1>Getting NixOS</h1>
+
+<p class="lead">
+  Below you will find installation instructions for NixOS, the linux
+  distribution. The latest stable release series is
+  <strong>[%latestNixOSSeries%]</strong>
+</p>
+
+<ul id="getting-nixos" class="nav nav-tabs">
+  <li class="active"><a href="#nixos-iso">ISO image</a></li>
+  <li><a href="#nixos-virtualbox">VirtualBox</a></li>
+  <li><a href="#nixos-amazon">Amazon EC2</a></li>
+  <li><a href="#nixos-azure">Microsoft Azure</a></li>
+  <li><a href="#nixos-google">Google Compute Engine</a></li>
+  <li><a href="#nixos-more">More ...</a></li>
+</ul>
+
+<div class="tab-content">
+  <section class="tab-pane active" id="nixos-iso">
+    <p>You can install NixOS on physical hardware by burning one of the CD
+      images onto a blank CD/DVD disk, or <a href="https://nixos.org/nixos/manual/index.html#sec-booting-from-usb">by
+        copying it onto a USB stick</a>. For <strong>installation
+        instructions</strong>, please see the <a href="[%nixosManual%]">manual</a>.</p>
+
+    <div class="alert alert-block">
+      Please note that NixOS at the moment lacks a nice, user-friendly
+      graphical installer. Therefore this form of installation may not be
+      suitable for novice Linux users.</div>
+
+    <p>The <strong>graphical installation CD</strong> contains the NixOS
+      installer as well as X11, Plasma 5 Desktop and several applications. It’s a
+      <em>live CD</em>, so it allows you to get an impression of NixOS (and
+      the Nix package manager) before installing it.</p>
+
+    [% prefix = "https://channels.nixos.org/nixos-" _ latestNixOSSeries %]
+
+    <ul>
+      <li><a href="[%prefix%]/latest-nixos-graphical-x86_64-linux.iso">Graphical live CD, 64-bit Intel/AMD</a> (<a
+          href="[%prefix%]/latest-nixos-graphical-x86_64-linux.iso.sha256">SHA-256</a>)
+        <span class="label label-info">Recommended for most users</span></li>
+    </ul>
+
+    <p>The <strong>minimal installation CD</strong> does not contain X11,
+      and is therefore a lot smaller. You have to run the installer from
+      the console. It contains a number of rescue tools.</p>
+
+    <ul>
+      <li><a href="[%prefix%]/latest-nixos-minimal-x86_64-linux.iso">Minimal installation CD, 64-bit Intel/AMD</a> (<a
+          href="[%prefix%]/latest-nixos-minimal-x86_64-linux.iso.sha256">SHA-256</a>)</li>
+      <li><a href="[%prefix%]/latest-nixos-minimal-i686-linux.iso">Minimal installation CD, 32-bit Intel/AMD</a> (<a
+          href="[%prefix%]/latest-nixos-minimal-i686-linux.iso.sha256">SHA-256</a>)</li>
+    </ul>
+  </section>
+  <section class="tab-pane" id="nixos-virtualbox">
+    <p>This is a demo appliance for VirtualBox (in OVA format) that has
+      X11 and Plasma 5 enabled, as well as the VirtualBox guest additions. To
+      use it, download the OVA file, open VirtualBox, run “File → Import
+      Appliance” from the menu, select the OVA file, and click “Import”.
+      You can then start the virtual machine. When the KDE login screen
+      appears, you can log in as <strong>user <code>demo</code></strong>,
+      <strong>password <code>demo</code></strong>. To obtain a root shell, run
+      <code>sudo -i</code> in the KDE terminal (<code>konsole</code>).</p>
+
+    <ul>
+      <li><a href="[%prefix%]/latest-nixos-x86_64-linux.ova">VirtualBox appliance, 64-bit Intel/AMD</a> (<a
+          href="[%prefix%]/latest-nixos-x86_64-linux.ova.sha256">SHA-256</a>)</li>
+    </ul>
+  </section>
+  <section class="tab-pane" id="nixos-amazon">
+    <p>If you are an EC2 user, you can fire up a NixOS instance instantly
+      by using one of the AMIs listed below.</p>
+
+    <div class="row">
+      <table class="table">
+        <thead>
+          <tr>
+            <th>Region</th>
+            <th>Root storage</th>
+            <th>Virtualisation</th>
+            <th>AMI</th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          [% amis = JSON.Escape.json_decode(IO.All.new(nixosAmis).all).$latestNixOSSeries %]
+          [% FOREACH region IN amis.keys.sort %]
+          [% FOREACH type IN amis.$region.keys.sort; ami = amis.$region.$type %]
+          <tr>
+            <td><code>[% region %]</code></td>
+            <td>[% IF type.search("ebs"); THEN; "EBS"; ELSE; "Instance"; END; %]</td>
+            <td>[% IF type.search("hvm"); THEN; "Hardware"; ELSE; "Para"; END; %]</td>
+            <td><code>[% ami %]</code></td>
+            <td><a href="https://console.aws.amazon.com/ec2/home?region=[%region%]#launchAmi=[%ami%]"
+                class="btn btn-primary btn-mini">Launch</a></td>
+          </tr>
+          [% END %]
+          [% END %]
+        </tbody>
+      </table>
+    </div>
+
+    <p>You can create an instance using the AWS Management Console by
+      clicking one of the Launch buttons. You can also create an instance
+      from the command line. For example, to create an instance in region
+      <code>[% region = "eu-west-1"; type = "pv-ebs"; ami =
+      amis.$region.$type; region %]</code> using the EC2 API tools, just
+      run:</p>
+
+    <pre class="well">
+        $ ec2-run-instances [% ami %] --region [% region %] -k <em>my-key-pair</em></pre>
+  </section>
+  <section class="tab-pane" id="nixos-azure">
+    <p>If you are an Azure user, you can manually create a NixOS instance
+      by using one of the bootstrap BLOBs listed below.</p>
+
+    <div class="row">
+      <table class="table">
+        <thead>
+          <tr>
+            <th>NixOS version</th>
+            <th>BLOB URL</th>
+          </tr>
+        </thead>
+        <tbody>
+          [% blobs = JSON.Escape.json_decode(IO.All.new(nixosAzureBlobs).all) %]
+          [% FOREACH version IN blobs.keys.sort; blob = blobs.$version %]
+          <tr>
+            <td><code>[% version %]</code></td>
+            <td><a href="[% blob %]"><code>[% blob %]</code></a></td>
+          </tr>
+          [% END %]
+        </tbody>
+      </table>
+    </div>
+
+    <p>You can create an instance from the command line.
+      For example, to create an instance of version
+      <code>[% blob = blobs.$latestNixOSSeries; latestNixOSSeries %]</code>
+      of NixOS using azure-cli, just run:</p>
+
+    <pre class="well">
+# settings
+# vm name must be lowercase and letters/numbers only because it's also used as the domain name
+export VM_NAME="nixosvm"
+export RESOURCE_GROUP="rg-nixosvm"
+export LOCATION="eastus"
+export STORAGE_ACCOUNT="nixosvm"
+export SOURCE_URI="<code>[% blob %]</code>"
+
+# create group
+az group create \
+    --name "$RESOURCE_GROUP" \
+    --location "$LOCATION
+
+# create storage
+az storage account create \
+    --name "$STORAGE_ACCOUNT" \
+    --group "$RESOURCE_GROUP" \
+    --location "$LOCATION" \
+    --sku Standard_LRS
+
+az storage account keys list \
+    --name "$STORAGE_ACCOUNT" \
+    --group $RESOURCE_GROUP
+
+# export one of the storage access keys
+export STORAGE_ACCOUNT_KEY="..."
+echo $STORAGE_ACCOUNT_KEY
+
+az storage container create \
+    --account-name "$STORAGE_ACCOUNT"
+    --account-key "$STORAGE_ACCOUNT_KEY"
+    --name vm-images
+
+# copy the image blob
+az storage blob copy start \
+    --source-uri "$SOURCE_URI" \
+    --destination-blob "nixos-unstable-nixops.vhd" \
+    --destination-container "vm-images" \
+    --account-name "$STORAGE_ACCOUNT" \
+    --account-key "$STORAGE_ACCOUNT_KEY"
+
+# wait for blob copy status to change pending->success
+az storage blob show \
+    --name "nixos-unstable-nixops.vhd" \
+    --container-name "vm-images" \
+    --account-name "$STORAGE_ACCOUNT" \
+    --account-key "$STORAGE_ACCOUNT_KEY"
+
+
+# create vm
+az vm create \
+    --name "$VM_NAME" \
+    --resource-group "$RESOURCE_GROUP" \
+    --location "$LOCATION" \
+    --public-ip-address-dns-name "$VM_NAME" \
+    --image "https://$STORAGE_ACCOUNT.blob.core.windows.net/vm-images/nixos-unstable-nixops.vhd" \
+    --storage-account "$STORAGE_ACCOUNT" \
+    --storage-container-name "$VM_NAME" \
+    --use-unmanaged-disk \
+    --os-disk-size-gb "32" \
+    --os-type linux \
+    --admin-username "azureuser" \
+    --generate-ssh-keys
+
+# show machine properties and log in
+az vm show \
+    --name "$VM" \
+    --resource-group "$GROUP"
+
+ssh azureuser@"$VM_NAME"."$LOCATION".cloudapp.azure.com</pre>
+  </section>
+  <section class="tab-pane" id="nixos-google">
+    <p>If you are Google Cloud Platform user, you can create a NixOS image using one of the raw disks listed below. You
+      can then create a NixOS instance using the image.</p>
+
+    <div class="row">
+      <table class="table">
+        <thead>
+          <tr>
+            <th>NixOS version</th>
+            <th>URL</th>
+          </tr>
+        </thead>
+        <tbody>
+          [% images = JSON.Escape.json_decode(IO.All.new(nixosGCE).all) %]
+          [% FOREACH version IN images.keys.sort; url = images.$version %]
+          <tr>
+            <td><code>[% version %]</code></td>
+            <td><a href="[% url %]"><code>[% url %]</code></a></td>
+          </tr>
+          [% END %]
+        </tbody>
+      </table>
+    </div>
+
+    <p>For example:</p>
+
+    <pre class="well">
+image=my-nixos-image
+source_uri=https://storage.googleapis.com/nixos-cloud-images/nixos-image-18.09.1228.a4c4cbb613c-x86_64-linux.raw.tar.gz
+source_uri=$(sed 's%gs:/%https://storage.googleapis.com%' &lt;&lt;&lt; $source_uri)
+gcloud compute images create $image --source-uri=$source_uri
+gcloud compute instances create instance-1 --image=$image</pre>
+  </section>
+  <section class="tab-pane" id="nixos-more">
+    <h2 id="unstable-releases">Unstable releases</h2>
+
+    <p>If you are a developer who wants to contribute to NixOS, or if you
+      just want the latest and greatest, you can also install the <a
+        href="https://nixos.org/channels/nixos-unstable">most
+        recent unstable
+        release</a>.</p>
+  </section>
+</div>
+
+<script charset="utf-8">
+  $('#getting-nixos a').click(function (e) {
+    e.preventDefault();
+    $(this).tab('show');
+  })
+
+</script>
+
+[% END %]
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -4,52 +4,16 @@
   description = "The nixos.org homepage";
 
   inputs.nixpkgsStable.url = "nixpkgs/release-19.09";
-  inputs.nixpkgsUnstable.url = "nixpkgs/master";
   inputs.nix-pills = { url = "github:NixOS/nix-pills"; flake = false; };
 
-  outputs = { self, nixpkgsUnstable, nixpkgsStable, nix-pills }:
+  outputs = { self, nixpkgsStable, nix-pills }:
     with import nixpkgsStable { system = "x86_64-linux"; };
     rec {
 
     checks.x86_64-linux.build = defaultPackage.x86_64-linux;
 
-    # Generate a JSON file listing the packages in Nixpkgs.
-    lib.nixpkgsToJSON = { src }: runCommand "nixpkgs-json"
-      { buildInputs = [ pkgs.nix jq ];
-      }
-      ''
-        export NIX_DB_DIR=$TMPDIR
-        export NIX_STATE_DIR=$TMPDIR
-        echo -n '{ "commit": "${src.rev}", "packages":' > tmp
-        nix-env -f '<nixpkgs>' -I nixpkgs=${src} -qa --json --arg config 'import ${./packages-config.nix}' >> tmp
-        echo -n '}' >> tmp
-        mkdir $out
-        < tmp sed "s|${src}/||g" | jq -c . > $out/packages.json
-
-        # Validate we don't keep references.
-        # The [^/] part of the expression could be changed for a better
-        # representation of a nix store path.
-        if jq < $out/packages.json | grep '/nix/store/[^/]+/'; then
-          echo "Errant nix store paths in packages.json output."
-          echo "See previous output as grepped."
-          exit 1
-        fi
-      '';
-
     packages.x86_64-linux = {
 
-      nixosOptions = (import (nixpkgsStable + "/nixos/release.nix") {
-        nixpkgs = nixpkgsStable;
-      }).options;
-
-      stablePackagesList = lib.nixpkgsToJSON {
-        src = nixpkgsStable;
-      };
-
-      unstablePackagesList = lib.nixpkgsToJSON {
-        src = nixpkgsUnstable;
-      };
-
       packagesExplorer = import ./packages-explorer nixpkgsStable;
 
       nixosAmis = writeText "ec2-amis.json"
@@ -103,9 +67,6 @@
           [ "NIX_MANUAL_IN=${nix.doc}/share/doc/nix/manual"
             "NIXOS_MANUAL_IN=${nixpkgsStable.htmlDocs.nixosManual}"
             "NIXPKGS_MANUAL_IN=${nixpkgsStable.htmlDocs.nixpkgsManual}"
-            "NIXPKGS_STABLE=${packages.x86_64-linux.stablePackagesList}"
-            "NIXPKGS_UNSTABLE=${packages.x86_64-linux.unstablePackagesList}"
-            "NIXOS_OPTIONS=${packages.x86_64-linux.nixosOptions}/share/doc/nixos/options.json"
             "NIXOS_AMIS=${packages.x86_64-linux.nixosAmis}"
             "NIXOS_GCE=${packages.x86_64-linux.nixosGCE}"
             "NIXOS_AZURE_BLOBS=${packages.x86_64-linux.nixosAzureBlobs}"
@@ -122,9 +83,6 @@
           export NIX_MANUAL_IN="${nix.doc}/share/doc/nix/manual"
           export NIXOS_MANUAL_IN="${nixpkgsStable.htmlDocs.nixosManual}"
           export NIXPKGS_MANUAL_IN="${nixpkgsStable.htmlDocs.nixpkgsManual}"
-          export NIXPKGS_STABLE="${packages.x86_64-linux.stablePackagesList}"
-          export NIXPKGS_UNSTABLE="${packages.x86_64-linux.unstablePackagesList}"
-          export NIXOS_OPTIONS="${packages.x86_64-linux.nixosOptions}/share/doc/nixos/options.json"
           export NIXOS_AMIS="${packages.x86_64-linux.nixosAmis}"
           export NIXOS_GCE="${packages.x86_64-linux.nixosGCE}"
           export NIXOS_AZURE_BLOBS="${packages.x86_64-linux.nixosAzureBlobs}"

diff --git a/governance.tt b/governance.tt
@@ -0,0 +1,148 @@
+[% WRAPPER layout.tt hideTitle=1 title="Governance" menu='nixos' %]
+
+<h1>Governance</h1>
+
+<p class="lead">Nix and NixOS are built by its community.</p>
+
+<div class="row-fluid">
+  <div class="span8">
+    <div class="hero-unit">
+      <h2>RFC Process</h2>
+      <p>The "RFC" (request for comments) process is intended to provide a
+         consistent and controlled path for new features to enter the Nix language,
+         packages and OS, so that all community can be confident about the
+         direction the ecosystem is evolving in.
+      </p>
+      <a href="https://github.com/NixOS/rfcs" class="btn btn-block btn-large btn-success">Learn more</a>
+    </div>
+  </div>
+  <div class="span4">
+    <a href="#rfc-process-modal" class="thumbnail" data-toggle="modal">
+      <img src="https://raw.githubusercontent.com/NixOS/rfcs/master/rfcs/0036-review-process.png"
+           alt="rfc process"
+           />
+    </a>
+    <div id="rfc-process-modal"
+         class="modal hide fade"
+         tabindex="-1"
+         role="dialog"
+         data-backdrop="false"
+         style="width: 700px; left:45%;">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+      </div>
+      <div class="modal-body" style="max-height: 600px;">
+        <img src="https://raw.githubusercontent.com/NixOS/rfcs/master/rfcs/0036-review-process.png"
+             alt="rfc process"
+             style="width: 100%"
+             />
+      </div>
+    </div>
+  </div>
+</div>
+
+<h2>Teams</h2>
+
+<div class="row-fluid">
+  <div class="span4">
+    <h3>RFC Steering Committee</h3>
+    <p>Responsible for forming an RFC Shepherd team from the available
+       nominations on each RFC, which is then responsible for accepting or
+       rejecting a specific RFC.
+    </p>
+    <a class="btn btn-block btn-success"
+      href="[%root%]teams/rfc-steering-committee.html">Members &amp; Contacts</a>
+  </div>
+  <div class="span4">
+    <h3>Security Team</h3>
+    <p>Security is a priority for the NixOS community. In addition to
+       community-sourced developments, NixOS has a dedicated team, to look into
+       privately reported security issues.
+    </p>
+    <a class="btn btn-block btn-success"
+       href="[%root%]teams/security.html">Members &amp; Contacts</a>
+  </div>
+  <div class="span4">
+    <h3>Infrastructure Team</h3>
+    <p>The responsibility of this team is to provide infrastructure for the Nix and
+       NixOS community.
+    </p>
+    <a class="btn btn-block btn-success"
+       href="[%root%]teams/infrastructure.html">Members &amp; Contacts</a>
+  </div>
+</div>
+
+<div class="row-fluid">
+  <div class="span4">
+    <h3>NixOS Release Team</h3>
+    <p>A team that twice a year manages a release of NixOS. It is responsible
+       the entire release process from setting the roadmap to uploading the
+       artifacts.
+    </p>
+    <a class="btn btn-block btn-success"
+       href="[%root%]teams/nixos_release.html">Members &amp; Contacts</a>
+  </div>
+  <div class="span4">
+    <h3>NixCon Team</h3>
+    <p>A team that helps organize NixCon, a conference for the Nix and NixOS
+       community.
+    </p>
+    <a class="btn btn-block btn-success"
+       href="[%root%]teams/nixcon.html">Members &amp; Contacts</a>
+  </div>
+  <div class="span4">
+    <h3>Marketing Team</h3>
+    <p>Its main responsibility is this website and the content on it. Apart from
+       the team looks for ways to help and improve general communication of
+       the project.
+    </p>
+    <a class="btn btn-block btn-success"
+       href="[%root%]teams/marketing.html">Members &amp; Contacts</a>
+  </div>
+</div>
+
+<div class="row-fluid">
+  <div class="span4">
+    <h3>Discourse Team</h3>
+    <p>It configures and moderates the Discourse forum.</p>
+    <a class="btn btn-block btn-success"
+       href="[%root%]teams/discourse.html">Members &amp; Contacts</a>
+  </div>
+</div>
+
+<div class="row-fluid">
+  <div class="span12">
+    <h2>NixOS Foundation</h2>
+
+    <p>The mission of the foundation is to support the Nix ecosystem's
+    infrastructure, and projects implementing the purely functional
+    deployment model.</p>
+
+    <p>In particular, the foundation supports Nix, Nixpkgs, NixOS, and
+    operates:</p>
+
+    <ul>
+      <li><a href="https://cache.nixos.org">cache.nixos.org</a> - the
+      NixOS binary cache, containing over 120TB of prebuilt Nix packages.</li>
+
+      <li><a href="https://hydra.nixos.org">hydra.nixos.org</a> - a Nix
+      build farm, consisting of hundreds of macOS, x86-64 (Linux) and
+      aarch64 (Linux) build cores. Hydra executes over 350,000 builds each
+      week.</li>
+    </ul>
+
+    <p>The NixOS Foundation is a registered non-profit organisation at the Chamber of
+    commerce (Kamer van Koophandel) in Utrecht, The Netherlands. The KvK number is 63520583.
+    </p>
+
+    <p>The board members are:</p>
+
+    <ul>
+      <li>Eelco Dolstra - Chairman</li>
+      <li>Armijn Hemel - Secretary</li>
+      <li>Rob Vermaas - Treasurer</li>
+    </ul>
+  </div>
+</div>
+
+[% END %]
diff --git a/index.tt b/index.tt
@@ -45,25 +45,25 @@
     <h2>Nix Packages collection</h2>
 
     <p>We provide a large set of Nix expressions containing thousands of
-    existing Unix packages, the <a href="../nixpkgs"><em>Nix Packages
-    collection</em> (Nixpkgs)</a>.</p>
+      existing Unix packages, the <a href="../nixpkgs"><em>Nix Packages
+          collection</em> (Nixpkgs)</a>.</p>
   </div>
 </div>
 
 <div class="nixos-org-index">
   [%# Title for the site, used to keep the document tree rooted at h1. %]
   <h1>NixOS</h1>
-  
+
   <div class="jumbotron-two">
     <div>
       <div class="intro-nix">
         <h2>Nix</h2>
-      
+
         <p>a powerful package manager for Linux and other Unix systems
-        that makes package management reliable and reproducible.  It
-        provides atomic upgrades and rollbacks, side-by-side installation
-        of multiple versions of a package, multi-user package management
-        and easy setup of build environments.
+          that makes package management reliable and reproducible. It
+          provides atomic upgrades and rollbacks, side-by-side installation
+          of multiple versions of a package, multi-user package management
+          and easy setup of build environments.
         </p>
 
         TODO: install guide
@@ -74,16 +74,15 @@
         </div>
       </div>
 
-
       <div class="intro-nixos">
         <h2>NixOS</h2>
-      
+
         <p>NixOS is a Linux distribution with a unique approach
-        to package and configuration management. Built on top of the
-        Nix package manager, it is completely declarative, makes
-        upgrading systems reliable, and has
-        <a href="[%root%]/nixos/about.html">many other advantages</a>.</p>
-      
+          to package and configuration management. Built on top of the
+          Nix package manager, it is completely declarative, makes
+          upgrading systems reliable, and has
+          <a href="[%root%]/nixos/about.html">many other advantages</a>.</p>
+
         TODO: link to download page
         <div class="learn-more">
           <a class="btn btn-success" href="[%root%]/nixos/">
@@ -93,7 +92,7 @@
       </div>
     </div>
   </div>
-  
+
 </div>
 
 [% END %]
diff --git a/layout.tt b/layout.tt
@@ -4,142 +4,86 @@
 
 <html lang="en">
 
-  <head>
-    <title>[% title %]</title>
-
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
-
-    <script type="text/javascript" src="[% root %]js/jquery.min.js"></script>
-    <script type="text/javascript" src="[% root %]js/jquery-ui.min.js"></script>
-
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-
-    <script type="text/javascript" src="[% root %]bootstrap/js/bootstrap.min.js"></script>
-    <link rel="stylesheet" href="[% root %]bootstrap/css/bootstrap.min.css" />
-
-    <link rel="stylesheet" href="[% root %]bootstrap/css/bootstrap-responsive.min.css" />
-
-    <link rel="stylesheet" href="[% root %]css/nixos-site.css" type="text/css" />
-
-    <link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" />
-
-    <link rel="shortcut icon" type="image/png" href="/favicon.png" />
-
-    <meta name="google-site-verification" content="8CARljo3xNgyEV4UGN3r6p9n3qpt3Wf_mqda-YB6SMQ" />
-
-  </head>
-
-  <body>
-
-    <div class="navbar navbar-fixed-top">
-      <div class="navbar-inner">
-        <div class="container">
-          <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <li class="dropdown brand">
-            <a class="dropdown-toggle" href="#" data-toggle="dropdown">
-              <img src="[% root %]logo/nix-wiki.png" alt="NixOS" class="logo" />
-              [% IF menu == 'nix' %]
-                Nix
-              [% ELSIF menu == 'nixpkgs' %]
-                Nixpkgs
-              [% ELSE %]
-                NixOS
-              [% END %]
-              <b class="caret"></b>
-            </a>
-            <ul class="dropdown-menu">
-              [%# Using %root% for / will not work as expected. %]
-              <li><a href="/">Site Home</a></li>
-              <li><a href="[%root%]nixos">NixOS</a></li>
-              <li><a href="[%root%]nix">Nix</a></li>
-              <li><a href="[%root%]nixpkgs">Nixpkgs</a></li>
-            </ul>
-          </li>
-
-          <div class="nav-collapse collapse">
-            [% IF menu == 'nixos' %]
-              <ul class="nav pull-left">
-                <li><a href="[%root%]nixos/download.html">Download</a></li>
-                <li><a href="[%root%]learn.html">Learn</a></li>
-                <li><a href="[%root%]nixos/packages.html">Packages</a></li>
-                <li><a href="[%root%]nixos/options.html">Options</a></li>
-                <li><a href="[%root%]nixos/community.html">Community</a></li>
-                <li><a href="[%root%]nixos/security.html">Security</a></li>
-              </ul>
-              <ul class="nav pull-right">
-                <!--
-                <li><a href="https://github.com/NixOS/nixpkgs"><i class="fa fa-github"></i></a></li>
-                <li><a href="https://twitter.com/nixos_org"><i class="fa fa-twitter"></i></a></li>
-                -->
-            [% ELSIF menu == 'nix' %]
-              <ul class="nav pull-left">
-                <li><a href="[%root%]nix/download.html">Download</a></li>
-                <li><a href="[%root%]learn.html">Learn</a></li>
-              </ul>
-              <ul class="nav pull-right">
-                <li><a href="https://github.com/NixOS/nix"><i class="fa fa-github"></i></a></li>
-            [% ELSIF menu == 'nixpkgs' %]
-              <ul class="nav pull-left">
-                <li><a href="[%root%]nixpkgs/download.html">Download</a></li>
-                <li><a href="[%root%]learn.html">Learn</a></li>
-              </ul>
-              <ul class="nav pull-right">
-                <li><a href="https://github.com/NixOS/nixpkgs"><i class="fa fa-github"></i></a></li>
-            [% ELSIF menu == 'organization' %]
-              <ul class="nav pull-right">
-                <li><a href="[%root%]learn.html">Learn</a></li>
-                <li><a href="https://github.com/NixOS/nixpkgs"><i class="fa fa-github"></i></a></li>
-                <li><a href="https://twitter.com/nixos_org"><i class="fa fa-twitter"></i></a></li>
-            [% ELSE %]
-              <ul class="nav pull-right">
-            [% END %]
-
-            </ul>
-          </div>
-        </div>
-      </div>
-    </div>
+<head>
+  <title>[% title %]</title>
+
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
+
+  <script type="text/javascript" src="[% root %]js/jquery.min.js"></script>
+  <script type="text/javascript" src="[% root %]js/jquery-ui.min.js"></script>
+
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+
+  <script type="text/javascript" src="[% root %]bootstrap/js/bootstrap.min.js"></script>
+  <link rel="stylesheet" href="[% root %]bootstrap/css/bootstrap.min.css" />
+
+  <link rel="stylesheet" href="[% root %]bootstrap/css/bootstrap-responsive.min.css" />
+
+  <link rel="stylesheet" href="[% root %]css/nixos-site.css" type="text/css" />
+
+  <link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css" />
+
+  <link rel="shortcut icon" type="image/png" href="/favicon.png" />
+
+  <meta name="google-site-verification" content="ir-07nYvo3u3x_VmkTO1wCfYJ8uC-SrVBGR7hZgqPSE" />
 
-    <div class="container main">
-      [% IF !hideTitle %]
-        <div class="page-header">
-          <h1>[% title %]</h1>
-        </div>
-      [% END %]
+</head>
 
-      [% content %]
+<body>
 
-      <div class="footer">
-        <hr />
-        <center>
+  <div class="nav-collapse collapse">
+    <ul class="nav pull-left">
+      <li><a href="[%root%]nixos/download.html">Download</a></li>
+      <li><a href="[%root%]learn.html">Learn</a></li>
+      <li><a href="[%root%]nixos/packages.html">Packages</a></li>
+      <li><a href="[%root%]nixos/options.html">Options</a></li>
+      <li><a href="[%root%]governance.html">Governance</a></li>
+      <li><a href="[%root%]nixos/community.html">Community</a></li>
+    </ul>
+    <!--
+    <ul class="nav pull-right">
+      <li><a href="https://github.com/NixOS/nixpkgs"><i class="fa fa-github"></i></a></li>
+      <li><a href="https://twitter.com/nixos_org"><i class="fa fa-twitter"></i></a></li>
+    </ul>
+    -->
+  </div>
+
+  <div class="container main">
+    [% IF !hideTitle %]
+    <div class="page-header">
+      <h1>[% title %]</h1>
+    </div>
+    [% END %]
+
+    [% content %]
+
+    <div class="footer">
+      <hr />
+      <center>
         <small class="muted">
           [% IF sourceLink %]
-            <a [% HTML.attributes(href => sourceLink) %]>Source</a>
+          <a [% HTML.attributes(href=> sourceLink) %]>Source</a>
           [% END %]
         </small>
-        </center>
-      </div>
-
+      </center>
     </div>
 
-    <script>
-      $(document).ready(function() {
-        $(".nixos-popover").popover({});
-      });
-    </script>
-
-    [% IF anchors %]
-      <script src="[% root %]js/anchor.min.js"></script>
-      <script>
-        anchors.add('h1,h2,h3');
-      </script>
-    [% END %]
+  </div>
+
+  <script>
+    $(document).ready(function () {
+      $(".nixos-popover").popover({});
+    });
+  </script>
+
+  [% IF anchors %]
+  <script src="[% root %]js/anchor.min.js"></script>
+  <script>
+    anchors.add('h1,h2,h3');
+  </script>
+  [% END %]
 
-  </body>
+</body>
 
 </html>
diff --git a/learn.tt b/learn.tt
@@ -5,117 +5,119 @@
   <div class="span4">
     <h2>Learn Nix</h2>
     <p>Nix is a package manager which comes in a form of many command line tools.
-       Packages that Nix can build are defined with Nix Expression Language.
+      Packages that Nix can build are defined with Nix Expression Language.
     </p>
     <ul>
-      <li><a href="[%root%]/nix/manual/#ch-installing-binary">Installation</a></li>
-      <li><a href="[%root%]/nix/manual/#ch-basic-package-mgmt">Basic package management</a></li>
-      <li><a href="[%root%]/nix/manual/#sec-channels">What is a channel?</a></li>
+      <li><a href="[%root%]nix/manual/#ch-installing-binary">Installation</a></li>
+      <li><a href="[%root%]nix/manual/#ch-basic-package-mgmt">Basic package management</a></li>
+      <li><a href="[%root%]nix/manual/#sec-channels">What is a channel?</a></li>
       <li>
         Main command line tools:
         <ul>
-          <li><a href="[%root%]/nix/manual/#sec-nix-env">nix-env</a> — manipulate or query Nix user environments</li>
-          <li><a href="[%root%]/nix/manual/#sec-nix-build">nix-build</a> — build a Nix expression</li>
-          <li><a href="[%root%]/nix/manual/#sec-nix-shell">nix-shell</a> — start an interactive shell based on a Nix expression</li>
-          <li><a href="[%root%]/nix/manual/#sec-nix-store">nix-store</a> — manipulate or query the Nix store</li>
+          <li><a href="[%root%]nix/manual/#sec-nix-env">nix-env</a> — manipulate or query Nix user environments</li>
+          <li><a href="[%root%]nix/manual/#sec-nix-build">nix-build</a> — build a Nix expression</li>
+          <li><a href="[%root%]nix/manual/#sec-nix-shell">nix-shell</a> — start an interactive shell based on a Nix
+            expression</li>
+          <li><a href="[%root%]nix/manual/#sec-nix-store">nix-store</a> — manipulate or query the Nix store</li>
         </ul>
       </li>
       <li>
-        <a href="[%root%]/nix/manual/#ch-expression-language">Nix expression language</a>
+        <a href="[%root%]nix/manual/#ch-expression-language">Nix expression language</a>
         <ul>
 
-          <li><a href="[%root%]/nix/manual/#ssec-builtins">Built-in functions</a></li>
-          <li><a href="[%root%]/nixpkgs/manual/#sec-functions-library">Nixpkgs Library Functions</a></li>
-          <li><a href="[%root%]/nixpkgs/manual/#sec-debug">Debugging Nix Expressions</a></li>
+          <li><a href="[%root%]nix/manual/#ssec-builtins">Built-in functions</a></li>
+          <li><a href="[%root%]nixpkgs/manual/#sec-functions-library">Nixpkgs Library Functions</a></li>
+          <li><a href="[%root%]nixpkgs/manual/#sec-debug">Debugging Nix Expressions</a></li>
         </ul>
       </li>
     </ul>
-    <a href="[%root%]/nix/manual" class="btn btn-block">More ...</a>
+    <a href="[%root%]nix/manual" class="btn btn-block">More ...</a>
   </div>
 
   <div class="span4">
     <h2>Learn Nixpkgs</h2>
-    <p>The Nix Packages collection (Nixpkgs) is a set of thousands of packages for the Nix package manager and NixOS linux distribution.</p>
+    <p>The Nix Packages collection (Nixpkgs) is a set of thousands of packages for the Nix package manager and NixOS
+      linux distribution.</p>
     <ul>
-      <li><a href="[%root%]/nixpkgs/manual/#chap-packageconfig">Configure nixpkgs</a></li>
-      <li><a href="[%root%]/nixpkgs/manual/#chap-overrides">Customize packages (override packages)</a></li>
-      <li><a href="[%root%]/nixpkgs/manual/#chap-overlays">Extend nixpkgs (via overlays)</a></li>
+      <li><a href="[%root%]nixpkgs/manual/#chap-packageconfig">Configure nixpkgs</a></li>
+      <li><a href="[%root%]nixpkgs/manual/#chap-overrides">Customize packages (override packages)</a></li>
+      <li><a href="[%root%]nixpkgs/manual/#chap-overlays">Extend nixpkgs (via overlays)</a></li>
       <li>
-        <a href="[%root%]/nixpkgs/manual/#chap-quick-start">Adding a package to nixpkgs</a>
+        <a href="[%root%]nixpkgs/manual/#chap-quick-start">Adding a package to nixpkgs</a>
         <ul>
-          <li><a href="[%root%]/nixpkgs/manual/#chap-stdenv">The Standard Environment</a></li>
-          <li><a href="[%root%]/nixpkgs/manual/#chap-pkgs-fetchers">Fetching sources</a></li>
+          <li><a href="[%root%]nixpkgs/manual/#chap-stdenv">The Standard Environment</a></li>
+          <li><a href="[%root%]nixpkgs/manual/#chap-pkgs-fetchers">Fetching sources</a></li>
           <li>
             Building images:
-            <a href="[%root%]/nixpkgs/manual/#sec-pkgs-dockerTools">Docker</a>,
-            <a href="[%root%]/nixpkgs/manual/#sec-pkgs-snapTools">Snap</a>,
-            <a href="[%root%]/nixpkgs/manual/#sec-pkgs-appimageTools">AppImage</a>,
-            <a href="[%root%]/nixpkgs/manual/#sec-pkgs-ociTools">OCI</a>,
+            <a href="[%root%]nixpkgs/manual/#sec-pkgs-dockerTools">Docker</a>,
+            <a href="[%root%]nixpkgs/manual/#sec-pkgs-snapTools">Snap</a>,
+            <a href="[%root%]nixpkgs/manual/#sec-pkgs-appimageTools">AppImage</a>,
+            <a href="[%root%]nixpkgs/manual/#sec-pkgs-ociTools">OCI</a>,
             ...
           </li>
         </ul>
       </li>
       <li>
         Integrate Nix with programming languages:
-        <a href="[%root%]/nixpkgs/manual/#node.js">Javascript (Node)</a>,
-        <a href="[%root%]/nixpkgs/manual/#python">Python</a>,
-        <a href="[%root%]/nixpkgs/manual/#sec-language-ruby">Ruby</a>
-        <a href="[%root%]/nixpkgs/manual/#sec-language-java">Java</a>,
-        <a href="[%root%]/nixpkgs/manual/#sec-language-go">Go</a>,
-        <a href="[%root%]/nixpkgs/manual/#rust">Rust</a>,
-        <a href="[%root%]/nixpkgs/manual/#r">R</a>,
-        <a href="[%root%]/nixpkgs/manual/#haskell">Haskell</a>,
-        <a href="[%root%]/nixpkgs/manual/#sec-elm">Elm</a>,
-        <a href="[%root%]/nixpkgs/manual/#sec-beam">BEAM Languages (Erlang, Elixir, LFE)</a>,
-        <a href="[%root%]/nixpkgs/manual/#sec-language-lua">Lua</a>,
-        <a href="[%root%]/nixpkgs/manual/#idris">Idris</a>,
-        <a href="[%root%]/nixpkgs/manual/#sec-language-coq">Coq</a>,
-        <a href="[%root%]/nixpkgs/manual/#sec-language-perl">Perl</a>,
-        <a href="[%root%]/nixpkgs/manual/#sec-language-ocaml">OCaml</a>,
+        <a href="[%root%]nixpkgs/manual/#node.js">Javascript (Node)</a>,
+        <a href="[%root%]nixpkgs/manual/#python">Python</a>,
+        <a href="[%root%]nixpkgs/manual/#sec-language-ruby">Ruby</a>
+        <a href="[%root%]nixpkgs/manual/#sec-language-java">Java</a>,
+        <a href="[%root%]nixpkgs/manual/#sec-language-go">Go</a>,
+        <a href="[%root%]nixpkgs/manual/#rust">Rust</a>,
+        <a href="[%root%]nixpkgs/manual/#r">R</a>,
+        <a href="[%root%]nixpkgs/manual/#haskell">Haskell</a>,
+        <a href="[%root%]nixpkgs/manual/#sec-elm">Elm</a>,
+        <a href="[%root%]nixpkgs/manual/#sec-beam">BEAM Languages (Erlang, Elixir, LFE)</a>,
+        <a href="[%root%]nixpkgs/manual/#sec-language-lua">Lua</a>,
+        <a href="[%root%]nixpkgs/manual/#idris">Idris</a>,
+        <a href="[%root%]nixpkgs/manual/#sec-language-coq">Coq</a>,
+        <a href="[%root%]nixpkgs/manual/#sec-language-perl">Perl</a>,
+        <a href="[%root%]nixpkgs/manual/#sec-language-ocaml">OCaml</a>,
         ...
       </li>
       <li>
         Integrate Nix with frameworks:
-        <a href="[%root%]/nixpkgs/manual/#android">Android</a>,
-        <a href="[%root%]/nixpkgs/manual/#ios">IOS</a>,
-        <a href="[%root%]/nixpkgs/manual/#titanium">Titanium</a>,
-        <a href="[%root%]/nixpkgs/manual/#sec-language-texlive">Tex Live</a>,
-        <a href="[%root%]/nixpkgs/manual/#sec-language-qt">Qt</a>,
+        <a href="[%root%]nixpkgs/manual/#android">Android</a>,
+        <a href="[%root%]nixpkgs/manual/#ios">IOS</a>,
+        <a href="[%root%]nixpkgs/manual/#titanium">Titanium</a>,
+        <a href="[%root%]nixpkgs/manual/#sec-language-texlive">Tex Live</a>,
+        <a href="[%root%]nixpkgs/manual/#sec-language-qt">Qt</a>,
         ...
       </li>
       <li>
         Configure your editor with Nix:
-          <a href="[%root%]/nixpkgs/manual/#vim">Vim</a>,
-          <a href="[%root%]/nixpkgs/manual/#sec-emacs">Emacs</a>,
-          <a href="[%root%]/nixpkgs/manual/#sec-eclipse">Eclipse</a>,
-          <a href="[%root%]/nixpkgs/manual/#sec-kakoune">Kakoune</a>,
-          <!-- TODO
-          <a href="[%root%]/nixpkgs/manual/#">Visual Studio Code</a>,
+        <a href="[%root%]nixpkgs/manual/#vim">Vim</a>,
+        <a href="[%root%]nixpkgs/manual/#sec-emacs">Emacs</a>,
+        <a href="[%root%]nixpkgs/manual/#sec-eclipse">Eclipse</a>,
+        <a href="[%root%]nixpkgs/manual/#sec-kakoune">Kakoune</a>,
+        <!-- TODO
+          <a href="[%root%]nixpkgs/manual/#">Visual Studio Code</a>,
           -->
-          ...
+        ...
       </li>
-      <li><a href="[%root%]/nixpkgs/manual/#chap-submitting-changes">Contributing to Nixpkgs</a></li>
+      <li><a href="[%root%]nixpkgs/manual/#chap-submitting-changes">Contributing to Nixpkgs</a></li>
     </ul>
-    <a href="[%root%]/nixpkgs/manual" class="btn btn-block">More ...</a>
+    <a href="[%root%]nixpkgs/manual" class="btn btn-block">More ...</a>
   </div>
 
   <div class="span4">
     <h2>Learn NixOS</h2>
     <p>NixOS is a Linux distribution based on Nix package manager.</p>
     <ul>
-      <li><a href="[%root%]/nixos/manual/#sec-installation">Installing NixOS</a></li>
-      <li><a href="[%root%]/nixos/manual/#sec-changing-config">Changing the Configuration</a></li>
-      <li><a href="[%root%]/nixos/manual/#sec-upgrading">Upgrading NixOS</a></li>
-      <li><a href="[%root%]/nixos/manual/#sec-configuration-syntax">Configuration Syntax</a></li>
-      <li><a href="[%root%]/nixos/manual/#sec-package-management">Package Management</a></li>
-      <li><a href="[%root%]/nixos/manual/#sec-user-management">User Management</a></li>
-      <li><a href="[%root%]/nixos/manual/#ch-troubleshooting">Troubleshooting</a></li>
-      <li><a href="[%root%]/nixos/manual/#sec-writing-modules">Writing NixOS Modules</a></li>
-      <li><a href="[%root%]/nixos/manual/#sec-writing-documentation">Writing NixOS Documentation</a></li>
-      <li><a href="[%root%]/nixos/manual/#sec-nixos-tests">Writing NixOS Tests</a></li>
-      <li><a href="[%root%]/nixos/manual/#sec-building-cd">Building Your Own NixOS CD</a></li>
+      <li><a href="[%root%]nixos/manual/#sec-installation">Installing NixOS</a></li>
+      <li><a href="[%root%]nixos/manual/#sec-changing-config">Changing the Configuration</a></li>
+      <li><a href="[%root%]nixos/manual/#sec-upgrading">Upgrading NixOS</a></li>
+      <li><a href="[%root%]nixos/manual/#sec-configuration-syntax">Configuration Syntax</a></li>
+      <li><a href="[%root%]nixos/manual/#sec-package-management">Package Management</a></li>
+      <li><a href="[%root%]nixos/manual/#sec-user-management">User Management</a></li>
+      <li><a href="[%root%]nixos/manual/#ch-troubleshooting">Troubleshooting</a></li>
+      <li><a href="[%root%]nixos/manual/#sec-writing-modules">Writing NixOS Modules</a></li>
+      <li><a href="[%root%]nixos/manual/#sec-writing-documentation">Writing NixOS Documentation</a></li>
+      <li><a href="[%root%]nixos/manual/#sec-nixos-tests">Writing NixOS Tests</a></li>
+      <li><a href="[%root%]nixos/manual/#sec-building-cd">Building Your Own NixOS CD</a></li>
     </ul>
-    <a href="[%root%]/nixos/manual" class="btn btn-block">More ...</a>
+    <a href="[%root%]nixos/manual" class="btn btn-block">More ...</a>
   </div>
 
 </div>
@@ -126,17 +128,23 @@
     <h2>Other learning resources</h2>
     <ul>
       <li>
-        <a href="[%root%]/nixos/nix-pills">Nix Pills</a> —  At the beginning you may feel that some of the magic which happens behind the scenes is hard to grasp. This series aims to complement the existing explanations from the more This wiki is user-maintained. formal documents.</li>
+        <a href="[%root%]nixos/nix-pills">Nix Pills</a> — At the beginning you may feel that some of the magic which
+        happens behind the scenes is hard to grasp. This series aims to complement the existing explanations from the
+        more formal documents.</li>
       <li><a href="https://nixos.wiki">Wiki</a> — A user-maintained wiki for Nix and NixOS.</li>
-      <li><a href="https://nix-cookbook.readthedocs.io">Nix cookbook</a> — Nix Community Cookbook presents topical, practical ways of using Nix package manager ecosystem.</li>
+      <li><a href="https://nix-cookbook.readthedocs.io">Nix cookbook</a> — Nix Community Cookbook presents topical,
+        practical ways of using Nix package manager ecosystem.</li>
     </ul>
   </div>
 
   <div class="span6">
     <h2>Get help from the community</h2>
     <ul>
-      <li><a href="https://discourse.nixos.org/">Discourse</a> — Discourse is a forum where we have discussions and help users out with their questions.</li>
-      <li><a href="irc://irc.freenode.net/#nixos">IRC</a> — You can drop by on the IRC channel <a href="irc://irc.freenode.net/#nixos"><strong><tt>#nixos</tt></strong></a> on <a href="https://freenode.net/"><tt>irc.freenode.net</tt></a> to chat with the developers or other users.</li>
+      <li><a href="https://discourse.nixos.org/">Discourse</a> — Discourse is a forum where we have discussions and help
+        users out with their questions.</li>
+      <li><a href="irc://irc.freenode.net/#nixos">IRC</a> — You can drop by on the IRC channel <a
+          href="irc://irc.freenode.net/#nixos"><strong><tt>#nixos</tt></strong></a> on <a
+          href="https://freenode.net/"><tt>irc.freenode.net</tt></a> to chat with the developers or other users.</li>
       <li><a href="https://stackoverflow.com/questions/tagged/nixos">Stackoverflow</a> — a place to ask questions.</li>
       <li><a href="https://www.reddit.com/r/NixOS">Reddit</a> — a place to discuss Nix / NixOS.</li>
     </ul>

diff --git a/netlify.toml b/netlify.toml
@@ -1,3 +1,57 @@
+[[redirects]]
+  from = "/nix/download.html"
+  to = "/download.html"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/nixpkgs/download.html"
+  to = "/download.html"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/nixos/download.html"
+  to = "/download.html"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/nix/learn.html"
+  to = "/learn.html"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/nixos/learn.html"
+  to = "/learn.html"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/nix-dev"
+  to = "https://releases.nixos.org/nix-dev/index.html"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/nix-dev/*"
+  to = "https://releases.nixos.org/nix-dev/:splat"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/nixos/security.html"
+  to = "/governance.html"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/nixos/foundation.html"
+  to = "/governance.html"
+  status = 302
+  force = true
+
 [[redirects]]
   from = "/channels/*"
   to = "https://channels.nixos.org/:splat"
@@ -30,7 +84,7 @@
 
 [[redirects]]
   from  = "/nix/install"
-  to = "https://releases.nixos.org/nix/nix-2.3.3/install"
+  to = "https://releases.nixos.org/nix/nix-2.3.4/install"
   status = 200
   #to = "https://channels.nixos.org/nix-latest/install"
   #status = 302
@@ -65,3 +119,87 @@
   to = "https://github.com/svanderburg/disnix"
   status = 302
   force = true
+
+[[redirects]]
+  from  = "/~eelco/*"
+  to = "https://edolstra.github.io/:splat"
+  status = 301
+  force = true
+
+[[redirects]]
+  from = "/nixpkgs/packages-nixos-19.09.json.gz"
+  to = "https://channels.nixos.org/nixos-19.09/packages.json.br"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/nixpkgs/packages-nixos-unstable.json.gz"
+  to = "https://channels.nixos.org/nixos-unstable/packages.json.br"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/patchelf.html"
+  to = "https://github.com/NixOS/patchelf"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/wiki/bootstrap/css/bootstrap.min.css"
+  to = "/bootstrap/css/bootstrap.min.css"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/wiki/bootstrap/css/bootstrap-responsive.min.css"
+  to = "/bootstrap/css/bootstrap-responsive.min.css"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/wiki/css/nixos-site.css"
+  to = "/css/nixos-site.css"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/wiki/bootstrap/js/bootstrap.min.js"
+  to = "/bootstrap/js/bootstrap.min.js"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/wiki/logo/nix-wiki.png"
+  to = "/logo/nix-wiki.png"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/wiki/js/jquery-ui.min.js"
+  to = "/js/jquery-ui.min.js"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/wiki/js/jquery.min.js"
+  to = "/js/jquery.min.js"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/~eelco/pubs/bootstrap/css/bootstrap-responsive.min.css"
+  to = "/bootstrap/css/bootstrap-responsive.min.css"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/~eelco/pubs/bootstrap/css/bootstrap.min.css"
+  to = "/bootstrap/css/bootstrap.min.css"
+  status = 302
+  force = true
+
+[[redirects]]
+  from = "/~eelco/pubs/css/nixos-site.css"
+  to = "/css/nixos-site.css"
+  status = 302
+  force = true
diff --git a/nix-release.tt b/nix-release.tt
@@ -1,3 +1,3 @@
 [%-
-latestNixVersion = "2.3.3"
+latestNixVersion = "2.3.4"
 -%]
diff --git a/nix/download.tt b/nix/download.tt
diff --git a/nixos/download.tt b/nixos/download.tt
diff --git a/nixos/foundation.tt b/nixos/foundation.tt
diff --git a/nixos/options.tt b/nixos/options.tt
@@ -355,7 +355,7 @@ function showOption() {
 };
 
 $.ajax({
-  url: '[%root%]nixos/options.json',
+  url: 'https://channels.nixos.org/nixos-[%latestNixOSSeries%]/options.json.br',
   type: 'GET',
   dataType: 'json',
   error: function(a, b, c) { alert('Failed to get option data.'); },

diff --git a/nixos/security.tt b/nixos/security.tt
diff --git a/nixpkgs/download.tt b/nixpkgs/download.tt
diff --git a/packages-explorer/src/gui/result.js b/packages-explorer/src/gui/result.js
@@ -67,7 +67,7 @@ const Position = use(["channel_data"], [], ({channel_data: {commit}, result: {me
 		<th>Nix expression</th>
 		<td>
 			{
-				position
+				position && commit
 					? <a href={githubLink(commit, position||"")}>
 						{position.replace(/:[0-9]+$/, "")}
 					</a>

diff --git a/packages-explorer/src/state.js b/packages-explorer/src/state.js
@@ -168,7 +168,7 @@ class State extends Component {
 		this.setState({loading: this.state.loading + 1});
 		const {hostname} = window.location;
 
-		fetch(`../nixpkgs/packages-${channel}.json`, {mode: "cors"})
+		fetch(`https://channels.nixos.org/${channel}/packages.json.br`, {mode: "cors"})
 			.then((response) => response.json())
 			.then((channel_data) => {
 				// Ensures we update only for the currently selected channel.

diff --git a/teams/discourse.tt b/teams/discourse.tt
@@ -0,0 +1,28 @@
+[% WRAPPER layout.tt hideTitle=1 title="Discourse Team" menu='nixos' %]
+
+<h1>Discourse Team</h1>
+
+
+<div class="lead">
+  This team is responsible for configuring and moderating the <a
+  href="https://discourse.nixos.org/">Discourse forum</a>.
+</div>
+
+<h2>Members</h2>
+
+<ul>
+  <li><a href="https://discourse.nixos.org/u/zimbatm">zimbatm</a> (zimbatm)</li>
+  <li><a href="https://discourse.nixos.org/u/ryantm/">Ryan Mulligan</a> (ryantm)</li>
+  <li><a href="https://discourse.nixos.org/u/garbas">Rok Garbas</a> (garbas)</li>
+  <li><a href="https://discourse.nixos.org/u/grahamc">Graham Christensen</a> (gchristensen)</li>
+  <li><a href="https://discourse.nixos.org/u/mic92">Jörg Thalheim</a> (Mic92)</li>
+</ul>
+
+<h2>Reporting issues</h2>
+
+<p>
+  If you have an issue with the forum or its content, you can send a direct
+  message on the forum to any of these people.
+</p>
+
+[% END %]
diff --git a/teams/infrastructure.tt b/teams/infrastructure.tt
@@ -0,0 +1,29 @@
+[% WRAPPER layout.tt hideTitle=1 title="Infrastructure Team" menu='nixos' %]
+
+<h1>Infrastructure Team</h1>
+
+
+<div class="lead">
+  The responsibility of the team is to provide infrastructure for the Nix and
+  NixOS community.
+</div>
+
+<h2>Members</h2>
+
+<ul>
+  <li><a href="https://github.com/AmineChikhaoui">Amine Chikhaoui</a> (aminechikhaoui)</li>
+  <li><a href="https://discourse.nixos.org/u/edolstra">Eelco Dolstra</a> (niksnut)</li>
+  <li><a href="https://discourse.nixos.org/u/grahamc">Graham Christensen</a> (gchristensen)</li>
+  <li><a href="https://discourse.nixos.org/u/rbvermaa">Rob Vermaas</a> (ikwildrpepper)</li>
+  <li><a href="https://discourse.nixos.org/u/zimbatm">zimbatm</a> (zimbatm)</li>
+</ul>
+
+<h2>Reporting issues</h2>
+
+<p>
+  If you experience any issues with the infrastructure, please post a
+  <a href="https://github.com/NixOS/nixos-org-configurations/issues/new">issue
+    to this repository</a>.
+</p>
+
+[% END %]
diff --git a/teams/marketing.tt b/teams/marketing.tt
@@ -0,0 +1,137 @@
+[% WRAPPER layout.tt hideTitle=1 title="Marketing team" menu='nixos' %]
+[% PROCESS common.tt %]
+
+<h1>Marketing team</h1>
+
+<p class="lead">
+</p>
+
+<h2>Members</h2>
+
+<ul>
+  <li><a href="https://discourse.nixos.org/u/garbas">Rok Garbas</a> (garbas)</li>
+  <li><a href="https://discourse.nixos.org/u/samueldr">Samuel Dionne-Riel</a> (samueldr)</li>
+  <li><a href="https://discourse.nixos.org/u/edolstra">Eelco Dolstra</a> (niksnut)</li>
+  <li><a href="https://discourse.nixos.org/u/grahamc">Graham Christensen</a> (gchristensen)</li>
+  <li><a href="https://discourse.nixos.org/u/davidak">David Kleuker</a> (davidak)</li>
+</ul>
+
+<h2>Contact</h2>
+
+<ul>
+  <li><a href="https://discourse.nixos.org/c/dev/marketing-team/28">Discourse</a></li>
+  <li><a href="https://www.youtube.com/playlist?list=PLt4-_lkyRrOOO8CYo5XPx6UI05q8kwhj0">Youtube</a></li>
+  <li><a href="irc://irc.freenode.net/#nixos-marketing">IRC</a></li>
+  <li><a href="mailto:webmaster@nixos.org">Email</a></li>
+</ul>
+
+<h2>Responsibilities</h2>
+
+<ul>
+  <li>
+    Main tool (and responsibility) is https://nixos.org 2 and the content on
+    it.
+  </li>
+  <li>
+    Research market / ecosystems where Nix/NixOS compete. How Nix/NixOS fits
+    in it and where it stands out.
+  </li>
+  <li>
+    Listen to the community, connect with companies that offer Nix/NixOS
+    consulting how nixos.org could better help them promote their services.
+  </li>
+</ul>
+
+<h2>How to participate and help?</h2>
+
+<p>
+  Clearly the topics that the marketing team will discuss are very
+  bikesheddey. We would like to see the team being assembled from every corner
+  of a Nix community. To join the team please write an email to 
+  <a href="mailto:webmaster@nixos.org">webmaster@nixos.org</a> trying to
+  answer the following questions:
+</p>
+
+<ul>
+  <li>Why would you like to join the team?</li>
+  <li>Why are you interested in marketing Nix?</li>
+  <li>What drives you?</li>
+  <li>How would you contribute to the marketing team?</li>
+  <li>What is your idea what marketing team will work on, this year? Next year?
+      Next 5 years?</li>
+  <li>What could be few easy fixes to the website that would solve problems
+      that you heard others complain about Nix/NixOS?</li>
+</ul>
+
+<p>
+  The answers are actually not used to judge people if they are good enough to
+  join, but to understand the person joining, their intent and their vision.
+  Since we will discuss many things that could be very bikeshedding it is
+  important that we understand each other’s position and the context they are
+  arguing from.
+</p>
+
+<h2>Meetings</h2>
+
+<p>
+  You can expect at meetings to discuss things first in an abstract manner
+  (what are our goals) and only then get into more concrete proposals (how do
+  we achieve goals). Meetings will be scheduled as needed and as much as the
+  team has time, but at least once a month. Initially it might happen that we
+  will meet more often until the whole idea of what a marketing team is/does
+  is bootstrapped. Minutes of the meetings will be published with the potential
+  agenda and the date of the next meeting.
+</p>
+
+<h2>FAQ</h2>
+
+<p>I tried to anticipate some questions/reactions:</p>
+
+<ul>
+  <li>
+    <p>
+      <strong>
+        What’s with all the corporate lingo? We are an open source community
+        and not a company?
+      </strong>
+    </p>
+    <p>
+      It is the language I’m familiar with and I know few others are as well.
+      If there are things that bother you please contact any of us and propose
+      ways in which we can improve.
+    </p>
+  </li>
+  <li>
+    <p><strong>Why not use the RFC process?</strong></p>
+    <p>
+      The RFC process targets changes to the Nix ecosystem. Technical changes,
+      not social changes. Going through the RFC process would expose this
+      endeavor to unneeded bikeshedding.
+    </p>
+  </li>
+  <li>
+    <p>
+      <strong>
+        How will you avoid bikeshedding? How will you get anything done?
+      </strong>
+    </p>
+    <p>We will try to do our best. Patience is the key :)</p>
+  </li>
+  <li>
+    <p><strong>How will you handle controversial topics?</strong></p>
+    <p>
+      When a controversial topic comes to be discussed we will look at it from
+      all the sides and provide a summary. We will try to invite the
+      community (especially the concerned part of the community) to get
+      involved more and try to clarify in as much as clear way as possible.
+      Experience shows that most of the time problem is in communication and
+      this is what we will always try to do better.
+    </p>
+  </li>
+  <li>
+    <p><strong>I don’t like that the community is becoming professional, can we just hack?</strong></p>
+    <p>We always avoid success, but let’s try for once to plan it :)</p>
+  </li>
+</ul>
+
+[% END %]
diff --git a/teams/nixcon.tt b/teams/nixcon.tt
@@ -0,0 +1,29 @@
+[% WRAPPER layout.tt hideTitle=1 title="NixCon Team" menu='nixos' %]
+
+<h1>NixCon Team</h1>
+
+<div class="lead">
+  Attending and organizing NixCon is a unique and special experience, different
+  from any other OS/FOSS conference.
+</div>
+
+<h2>Members</h2>
+
+<ul>
+  <li><a href="https://discourse.nixos.org/u/andir">Andreas Rammhold</a> (andir)</li>
+  <li><a href="https://discourse.nixos.org/u/flokli">Florian Klink</a> (flokli)</li>
+  <li><a href="https://discourse.nixos.org/u/zimbatm">zimbatm</a> (zimbatm)</li>
+</ul>
+
+<a href="https://discourse.nixos.org/t/help-organize-nixcon-2020/4901">Help organize NixCon 2020 !!!</a>
+
+
+<h2>Previous NixCon</h2>
+<ul>
+  <li><a href="https://conf.nixos.org">NixCon 2015, Berlin</a></li>
+  <li><a href="http://nixcon2017.org">NixCon 2017, Munchen</a></li>
+  <li><a href="https://nixcon2018.org">NixCon 2018, London</a></li>
+  <li><a href="https://2019.nixcon.org">NixCon 2019, Brno</a></li>
+</ul>
+
+[% END %]
diff --git a/teams/nixos_release.tt b/teams/nixos_release.tt
@@ -0,0 +1,41 @@
+[% WRAPPER layout.tt hideTitle=1 title="NixOS Release Team" menu='nixos' %]
+
+<h1>NixOS Release Team</h1>
+
+<div class="lead">
+  For each release there are two release managers. After each release the
+  release manager having managed two releases steps down and the release
+  management team of the last release appoints a new release manager.
+</div>
+
+<p>
+  This makes sure a release management team always consists of one release
+  manager who already has managed one release and one release manager being
+  introduced to their role, making it easier to pass on knowledge and
+  experience.
+</p>
+
+<h2>Members</h2>
+
+<ul>
+  <li><a href="https://discourse.nixos.org/u/worldofpeace">worldofpeace</a> (worldofpeace) - primary for 20.03</li>
+  <li><a href="https://discourse.nixos.org/u/disassembler">Samuel Leathers</a> (disasm) - primary for 19.09</li>
+</ul>
+
+<h2>Responsibilities</h2>
+
+<ul>
+  <li>manage the release process</li>
+  <li>start discussions about features and changes for a given release</li>
+  <li>create a roadmap</li>
+  <li>release in cooperation with Eelco Dolstra</li>
+  <li>decide which bug fixes, features, etc... get back ported after a release</li>
+</ul>
+
+<h2>Release process</h2>
+
+More information can be found in <a
+href="https://nixos.org/nixos/manual/index.html#release-managers"> the nixos
+manual</a>
+
+[% END %]
diff --git a/teams/rfc-steering-committee.tt b/teams/rfc-steering-committee.tt
@@ -0,0 +1,67 @@
+[% WRAPPER layout.tt hideTitle=1 title="RFC Steering Committee" menu='nixos' %]
+[% PROCESS common.tt %]
+
+<h1>RFC Steering Committee</h1>
+
+<p class="lead">
+  This committee is responsible for forming an RFC Shepherd team from the
+  available nominations on each RFC. This team also names the leader of the
+  Shepherd team.
+</p>
+
+<p>
+  They have no special responsibility with regard to the content of an RFC,
+  they can weigh in on them, the same as any other community member, but are
+  only in charge of:
+</p>
+
+<ul>
+  <li>selecting the Shepherds unanimously</li>
+  <li>supervising that the Shepherds are carrying out their work</li>
+  <li>committing the final RFC</li>
+</ul>
+
+<h2>Members</h2>
+
+<ul>
+  <li><a href="https://discourse.nixos.org/u/edolstra">Eelco Dolstra</a> (niksnut)</li>
+  <li><a href="https://discourse.nixos.org/u/mic92">Jörg Thalheim</a> (Mic92)</li>
+  <li><a href="https://discourse.nixos.org/u/spacekookie">Katharina Fey</a> (spacekookie)</li>
+  <li><a href="https://discourse.nixos.org/u/worldofpeace">worldofpeace</a> (worldofpeace)</li>
+  <li><a href="https://discourse.nixos.org/u/lheckemann">Linus Heckemann</a> (sphalerite)</li>
+</ul>
+
+
+<h2>Shepherd Team</h2>
+
+<p>
+  A team of 3-4 community members defined unanimously by the RFC Steering
+  Committee, responsible for accepting or rejecting a specific RFC. This team
+  is created per RFC from community members nominated in the discussion on
+  that RFC.
+</p>
+
+<p>
+  This team should be people who are very familiar with the main components
+  touched by the RFC. The author cannot be part of the Shepherd Team. In
+  addition, at most half of the Shepherd Team can be part of the RFC Steering
+  Committee.
+</p>
+
+<p>
+  The responsibility of the team is to guide the discussion as long as it is
+  constructive, new points are brought up and the RFC is iterated on and from
+  time to time summarise the current state of discussion. If this is the case
+  no longer, then the Shepherd Team shall step in with a motion for FCP.
+</p>
+
+<h2>Shepherd Leader</h2>
+
+<p>
+  The person in charge of the RFC process for a specific RFC, and responsible
+  for ensuring the process is followed in a timely fashion. The Shepherd Leader
+  has no special responsibility with regard to moving an undecided Shepherd
+  Team to a certain decision.
+</p>
+
+[% END %]
diff --git a/teams/security.tt b/teams/security.tt
@@ -0,0 +1,93 @@
+[% WRAPPER layout.tt hideTitle=1 title="Security Team" menu='nixos' %]
+[% PROCESS common.tt %]
+
+<h1>Security Team</h1>
+
+<div class="lead">
+  In addition to community-sourced developments, NixOS has a dedicated security
+  team. If the above sources are not enough to answer your question, please
+  reach out to a member of the team listed below.
+</div>
+
+<h3>Security Disclosures</h3>
+
+<p>
+  To privately report a security issue with NixOS, Nix, and its ecosystem,
+  please email a member of the NixOS Security Team and we will ensure the issue
+  is handled. Our responses will be signed with our GPG keys.
+</p>
+
+<h2>Sources of Security Information</h2>
+
+<p>
+  Security is a priority for the NixOS community. A variety of channels are used
+  to coordinate development in this vein. Three of the main modes of communication
+  about NixOS security are:
+</p>
+
+<ul>
+  <li>The issues tagged "Security" on <a href="https://github.com/NixOS/nixpkgs/issues?q=is%3Aopen+is%3Aissue+label%3A%221.severity%3A+security%22">GitHub/NixOS</a>
+  </li>
+  <li>The #nixos-security IRC channel on FreeNode
+  </li>
+  <li>The NixOS security <a href="https://discourse.nixos.org/c/dev/security">discourse</a>
+  </li>
+</ul>
+
+<h2>Members</h2>
+
+<ul>
+  <li>
+    <p>
+      <a href="https://discourse.nixos.org/u/grahamc">Graham Christensen</a>,
+      <a href="mailto:graham@grahamc.com">graham@grahamc.com</a>
+      (gchristensen)
+      <br />
+      <strong>GPG Key:</strong>
+      <tt>
+        <a href="https://pgp.mit.edu/pks/lookup?op=get&amp;search=0xFE918C3A98C1030F">0xFE918C3A98C1030F</a>
+      </tt>
+      <br />
+      <strong>GPG Fingerprint:</strong>
+      <tt>BA94 FDF1 1DA4 0521 2864  C121 FE91 8C3A 98C1 030F</tt>
+    </p>
+  </li>
+  <li>
+    <p>
+       <a href="https://discourse.nixos.org/u/fpletz">Franz Pletz</a>,
+       <a href="mailto:fpletz@fnordicwalking.de">fpletz@fnordicwalking.de</a>
+       (fpletz)
+       <br />
+       <strong>GPG Key:</strong>
+       <tt>
+         <a href="https://pgp.mit.edu/pks/lookup?op=get&amp;search=0x846FDED7792617B4">0x846FDED7792617B4</a>
+       </tt>
+       <br />
+       <strong>GPG Fingerprint:</strong>
+       <tt>8A39 615D CE78 AF08 2E23  F303 846F DED7 7926 17B4</tt>
+    </p>
+  </li>
+  <li>
+    <p>
+       <a href="https://discourse.nixos.org/u/domenkozar">Domen Kožar</a>,
+       <a href="mailto:domen@dev.si">domen@dev.si</a>
+       (domenkozar)
+       <br />
+       <strong>GPG Key:</strong><tt>
+          <a href="https://pgp.mit.edu/pks/lookup?op=get&amp;search=0xC2FFBCAFD2C24246">0xC2FFBCAFD2C24246</a>
+       </tt><br />
+       <strong>GPG Fingerprint:</strong>
+       <tt>E96C 15A0 8D17 CE3B 17B0  C7AB C2FF BCAF D2C2 4246</tt>
+    </p>
+  </li>
+  <li>
+    <p>
+       <a href="https://discourse.nixos.org/u/rbvermaa">Rob Vermaas</a> - emeritus,
+       <a href="mailto:rob.vermaas@gmail.com">rob.vermaas@gmail.com</a>
+       (ikwildrpepper)
+       <br />
+    </p>
+  </li>
+</ul>
+
+[% END %]
diff --git a/update.sh b/update.sh
@@ -2,4 +2,4 @@
 
 UPDATE=1 nix run nixpkgs#gnumake nixpkgs#curl -c make update --keep-going || true
 
-nix flake update --update-input nixpkgsStable --update-input nixpkgsUnstable || true
+nix flake update --update-input nixpkgsStable || true
Original file line number	Diff line number	Diff line change
		@@ -2,4 +2,4 @@

		UPDATE=1 nix run nixpkgs#gnumake nixpkgs#curl -c make update --keep-going \|\| true

		nix flake update --update-input nixpkgsStable --update-input nixpkgsUnstable \|\| true
		nix flake update --update-input nixpkgsStable \|\| true