NixOS · Apr 15, 2020
Showing with 69 additions and 115 deletions.

+2 −3 Makefile

0 {nixos → }/community.tt

+2 −3 css/nixos-site.css

+59 −77 index.tt

+6 −0 netlify.toml

+0 −32 nixos/wiki.tt
diff --git a/Makefile b/Makefile
@@ -6,12 +6,11 @@ rwildcard=$(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2) $(filter $(subst
 default: all
 
 
-HTML = index.html download.html news.html learn.html governance.html \
+HTML = index.html download.html news.html learn.html governance.html community.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/wiki.html \
+  nixos/packages.html nixos/options.html \
   404.html
 
 

diff --git a/nixos/community.tt → community.tt b/nixos/community.tt → community.tt
diff --git a/css/nixos-site.css b/css/nixos-site.css
@@ -40,9 +40,8 @@ p {
 	padding-bottom: 0;
 }
 
-.navbar .navbar-search {
-  margin-top: 0.6em;
-
+.navbar .navbar-search .input-append {
+  margin: 0px;
 }
 
 .dropdown .caret {

diff --git a/index.tt b/index.tt
@@ -9,90 +9,72 @@
 <div class="row-fluid">
 
   <div class="span6">
-    <h2>Nix</h2>
+    <h1>Hermetic / Reliable builds and deployments of applications in the Cloud and more.</h1>
+    <p class="lead">
+      Nix is an open source build tool that helps you package and deliver
+      any application in a <strong>reproducible</strong> way.
+      NixOS is a linux distribution built upon the Nix package manager that
+      brings reliable/predictable deployments at your fingertips.
+    </p>
+    <a class="btn btn-large btn-success" href="[% root %]download.html">Get started</a>
   </div>
 
   <div class="span6">
-    <h2>NixOS</h2>
+    <h4>TODO: A video / picture of NixOS in action!</h4>
   </div>
 </div>
 
-<div class="row-fluid">
-  <div class="span6">
-    <h2>Why Nix?</h2>
-    <h3>Complete dependencies</h3>
-    <h3>Multiple versions</h3>
-    <h3>Multi-user support</h3>
-    <h3>Atomic upgrades and rollbacks</h3>
-    <h3>Transparent source/binary deployment</h3>
-    <h3>Managing build environments</h3>
-    <h3>Portability</h3>
-  </div>
-
-  <div class="span6">
-    <h2>Why NixOS?</h2>
-    <h3>Reproducible system configurations</h3>
-    <h3>Declarative system configuration model</h3>
-    <h3>Reliable upgrades</h3>
-    <h3>Atomic upgrades</h3>
-    <h3>Rollbacks</h3>
-    <h3>Safe to test changes</h3>
-  </div>
-</div>
-
-<div class="row-fluid">
-  <div class="span12">
-    <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>
-  </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.
-        </p>
-
-        TODO: install guide
-        <div class="learn-more">
-          <a class="btn btn-success" href="[%root%]/nix/">
-            <i class="fa fa-chevron-right"></i> Learn more about Nix
-          </a>
-        </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>
-
-        TODO: link to download page
-        <div class="learn-more">
-          <a class="btn btn-success" href="[%root%]/nixos/">
-            <i class="fa fa-chevron-right"></i> Learn more about NixOS
-          </a>
-        </div>
-      </div>
+<ul class="thumbnails">
+  <li class="span4">
+    <div class="thumbnail">
+      <h3>Multi language support</h3>
+      <p>
+        Interesting projects usually require you to work together with multiple
+        ecosystems of programming languages. Nix can help you bring all
+      </p>
     </div>
-  </div>
-
+  </li>
+  <li class="span4">
+    <div class="thumbnail">
+      <h3>External dependencies</h3>
+      <p>
+      </p>
+    </div>
+  </li>
+  <li class="span4">
+    <div class="thumbnail">
+      <h3>Deploy to Cloud</h3>
+      <p>
+      </p>
+    </div>
+  </li>
+</ul>
+
+<div class="hero-unit">
+  <h2>Install Nix</h2>
+  <pre class="well" style="margin-top:1em">
+<span class="nix-command">curl -L https://nixos.org/nix/install | sh</span></pre>
+  <h4>Search for packages</h4>
+  <pre class="well" style="margin-top:1em">
+<span class="nix-command">nix-env -qaP firefox</span>
+nixpkgs.firefox-esr firefox-68.5.0esr
+nixpkgs.firefox-esr-wrapper firefox-68.5.0esr
+nixpkgs.firefox firefox-73.0.1
+nixpkgs.firefox-wayland firefox-73.0.1
+nixpkgs.firefox-wrapper firefox-73.0.1
+nixpkgs.firefoxWrapper firefox-73.0.1</pre>
+  <h4>Install a package</h4>
+  <pre class="well" style="margin-top:1em">
+<span class="nix-command">nix-env -iA nixpkgs.firefox</span>
+installing 'firefox-73.0.1'
+...
+building '/nix/store/jyi3glna0k1k1d42a3jkfpnjl5ikkva5-user-environment.drv'...</pre>
+  <p>
+    <a class="btn btn-success btn-large" href="[% root %]learn.html">
+      Learn more
+    </a>
+  </p>
 </div>
 
+
 [% END %]
diff --git a/netlify.toml b/netlify.toml
@@ -1,3 +1,9 @@
+[[redirects]]
+  from = "/nixos/wiki.html"
+  to = "https://nixos.wiki"
+  status = 302
+  force = true
+
 [[redirects]]
   from = "/nix/download.html"
   to = "/download.html"

diff --git a/nixos/wiki.tt b/nixos/wiki.tt