website: set things up to go live~

TODO.md

@@ -3,15 +3,12 @@ TODO List
 
 ## Soft Release Blockers
 
-- Remove the "pending pull request" from the install page, once that's merged.
-- Fix the way CSS makes the page look on narrower monitors / mobile phones
 - Fix the logo to have proper transparency
 
 ## After Soft Release
 
 ### Misc
 
-- Fix the CSS vertical alignment on webkit mobile
 - Figure out where to link the "Docs" link to, and uncomment it.
 
 ### Content

content/add-to-config.md

@@ -1,16 +1,183 @@
 ---
 title:  "Switching To Lix"
-description: "or: how to make your existing configuration Delicious"
+description: "or: how to make your existing configruation Delicious"
 date: "2024-04-27"
 author: "Lix Team"
 ---
 
-**Not yet available.**
+If you have an existing configuration on **NixOS** or **nix-darwin**, the easiest way
+to switch to Lix is currently by using our provided _NixOS module_. Fortunately, this
+usually means adding only a couple of lines to your configuration.
 
-This install page is currently hidden until this website officially launches. We appreciate how excited you must be,
+## Flake-based Configurations
-given you've found this site ahead of time! Thanks for your support and patience. <3
 
-<small><small>
+Adding Lix to a flake-based configuration is relatively simple. First, add the Lix module to your _flake inputs_:
-_Psst! If you're in our beta and want to peek at the instructions ahead of time, they're in the git repo for this website._
-</small></small>
 
+```nix
+{
+  inputs = {
+
+    # Add this section to your flake inputs!
+    #
+    # Note that this assumes you have a flake-input called nixpkgs,
+    # which is often the case. If you've named it something else, 
+    # you'll need to change the `nixpkgs` below.
+    lix = {
+      url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
+      flake = false;
+    };
+    lix-module = {
+      url = "git+https://git.lix.systems/lix-project/nixos-module";
+      inputs.lix.follows = "lix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+  }
+
+  # <rest of configuration omitted>
+}
+```
+
+Next, add the `lix-module` as one of the arguments to your output function:
+
+```nix
+{
+  # <configuration above omitted>
+
+  # Add the `lix-module` argument to your output function, as below:
+  outputs = {nixpkgs, lix-module, ...}: {
+      # <rest of configuration omitted>
+  }
+}
+```
+
+Add the Lix _NixOS Module_ to your configuration:
+
+```nix
+{
+  # <configuration above omitted>
+
+  # Add the `lix-module` argument to your output function, as below:
+  outputs = {nixpkgs, lix-module, ...}: {
+
+      # The configuration here is an example; it will look slightly different
+      # based on your platform (NixOS, nix-darwin) and architecture.
+      nixosConfigurations.your-box = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux"
+
+        modules = [
+
+          # This is the important part -- add this line to your module list!
+          lix-module.nixosModules.default
+        ];
+
+      };
+  }
+
+  # <configuration below omitted>
+}
+```
+
+Finally, if you'd prefer not to build Lix yourself, you can add our binary cache. 
+Add the following to any NixOS module in your configuration (e.g. `configuration.nix`):
+
+```nix
+{
+  nix.settings.extra-substituters = [
+    "https://cache.lix.systems"
+  ];
+
+  nix.settings.trusted-public-keys = [
+    "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
+  ];
+}
+```
+
+Rebuild and switch into your new system (either using `nixos-rebuild` or `darwin-rebuild`).
+You should now be using Lix! You can verify this by asking the `nix` command to report its version:
+
+```sh
+$ nix --version
+nix (Lix, like Nix) 2.90.0-beta.0
+```
+
+As long as you see `Lix` in the output, you're good! If you're not sure what to do now, it's a
+great time to check out some of the [community's resources on Nix](/resources).
+
+
+## Non-Flake Configurations
+
+If you're not using flakes, you can set up your configuration to automatically pull down a
+Lix release tarball, and then add it to your `configuration.nix`.
+
+Open your `/etc/nixos/configuration.nix` in the editor of your choice. Find the `imports`
+section, and add the line provided in the configuration 
+
+<mark>
+<b>This section is currently pending on a quick update.</b>
+</mark>
+<br/>
+<br/>
+
+```nix
+{ config, lib, pkgs, ... }:
+{
+  imports =
+    [ # Include the results of the hardware scan.
+      ./hardware-configuration.nix
+
+      # This is the core line -- it pulls down the Lix module and
+      # includes it in your configuration. It looks much nicer with a let
+      # binding -- but for clarity, we'll leave that as an exercise for the 
+      # reader. :)
+      #
+      # Note that the tag (e.g. v2.90) in the URL here is what determines
+      # which version of Lix you'll wind up with.
+      (import 
+        (
+          (fetchTarball { url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; }) + "/module.nix"
+        ) 
+        { 
+          lix = fetchTarball { url = "https://git.lix.systems/lix-project/lix/archive/2.90-beta.1.tar.gz"; }; 
+        }
+      )
+    ];
+
+  # <configuration below omitted>
+}
+```
+
+Finally, if you'd prefer not to build Lix yourself, you can add our binary cache. 
+Add the following to any NixOS module in your configuration (e.g. `configuration.nix`):
+
+```nix
+{
+  nix.settings.extra-substituters = [
+    "https://cache.lix.systems"
+  ];
+
+  nix.settings.trusted-public-keys = [
+    "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
+  ];
+}
+```
+
+Rebuild and switch into your new system (either using `nixos-rebuild` or `darwin-rebuild`).
+You should now be using Lix! You can verify this by asking the `nix` command to report its version:
+
+```sh
+$ nix --version
+nix (Lix, like Nix) 2.90.0-beta.0
+```
+
+As long as you see `Lix` in the output, you're good! If you're not sure what to do now, it's a
+great time to check out some of the [community's resources on Nix](/resources).
+
+## Having Trouble?
+
+**One quick thing to check:** have you set `nix.package` anywhere in your configuration?   
+If so, your configuration option will override the Lix module. You'll want to remove it, first -- 
+or, if you're feeling savvy, point it to the provided Lix package.
+
+**Otherwise:** If you're having difficulty installing Lix, don't panic! Hop on over to our
+[community page](/community), and check out the various ways to find help.

content/add-to-config_actual.md

@@ -1,183 +0,0 @@
----
-title:  "Switching To Lix"
-description: "or: how to make your existing configruation Delicious"
-date: "2024-04-27"
-author: "Lix Team"
----
-
-If you have an existing configuration on **NixOS** or **nix-darwin**, the easiest way
-to switch to Lix is currently by using our provided _NixOS module_. Fortunately, this
-usually means adding only a couple of lines to your configuration.
-
-## Flake-based Configurations
-
-Adding Lix to a flake-based configuration is relatively simple. First, add the Lix module to your _flake inputs_:
-
-```nix
-{
-  inputs = {
-
-    # Add this section to your flake inputs!
-    #
-    # Note that this assumes you have a flake-input called nixpkgs,
-    # which is often the case. If you've named it something else, 
-    # you'll need to change the `nixpkgs` below.
-    lix = {
-      url = "git+ssh://git@git.lix.systems/lix-project/lix";
-      flake = false;
-    };
-    lix-module = {
-      url = "git+https://git.lix.systems/lix-project/nixos-module";
-      inputs.lix.follows = "lix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-  }
-
-  # <rest of configuration omitted>
-}
-```
-
-Next, add the `lix-module` as one of the arguments to your output function:
-
-```nix
-{
-  # <configuration above omitted>
-
-  # Add the `lix-module` argument to your output function, as below:
-  outputs = {nixpkgs, lix-module, ...}: {
-      # <rest of configuration omitted>
-  }
-}
-```
-
-Add the Lix _NixOS Module_ to your configuration:
-
-```nix
-{
-  # <configuration above omitted>
-
-  # Add the `lix-module` argument to your output function, as below:
-  outputs = {nixpkgs, lix-module, ...}: {
-
-      # The configuration here is an example; it will look slightly different
-      # based on your platform (NixOS, nix-darwin) and architecture.
-      nixosConfigurations.your-box = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux"
-
-        modules = [
-
-          # This is the important part -- add this line to your module list!
-          lix-module.nixosModules.default
-        ];
-
-      };
-  }
-
-  # <configuration below omitted>
-}
-```
-
-Finally, to add our binary cache (optional), add the following to any NixOS module in your configuration
-(e.g. configuration.nix):
-
-```nix
-{
-  nix.settings.extra-substituters = [
-    "https://cache.lix.systems"
-  ];
-
-  nix.settings.trusted-public-keys = [
-    "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
-  ];
-}
-```
-
-Rebuild and switch into your new system (either using `nixos-rebuild` or `darwin-rebuild`).
-You should now be using Lix! You can verify this by asking the `nix` command to report its version:
-
-```sh
-$ nix --version
-nix (Lix, like Nix) 2.90.0-beta.0
-```
-
-As long as you see `Lix` in the output, you're good! If you're not sure what to do now, it's a
-great time to check out some of the [community's resources on Nix](/resources).
-
-
-## Non-Flake Configurations
-
-If you're not using flakes, you can set up your configuration to automatically pull down a
-Lix release tarball, and then add it to your `configuration.nix`.
-
-Open your `/etc/nixos/configuration.nix` in the editor of your choice. Find the `imports`
-section, and add the line provided in the configuration 
-
-<mark>
-<b>This section is currently pending on a quick update.</b>
-</mark>
-<br/>
-<br/>
-
-```nix
-{ config, lib, pkgs, ... }:
-{
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-
-      # This is the core line -- it pulls down the Lix module and
-      # includes it in your configuration. It looks much nicer with a let
-      # binding -- but for clarity, we'll leave that as an exercise for the 
-      # reader. :)
-      #
-      # Note that the tag (e.g. v2.90) in the URL here is what determines
-      # which version of Lix you'll wind up with.
-      (import 
-        (
-          (fetchTarball { url = "https://git.lix.systems/lix-project/nixos-module/archive/main.tar.gz"; }) + "/module.nix"
-        ) 
-        { 
-          lix = fetchTarball { url = "https://git.lix.systems/lix-project/lix/archive/main.tar.gz"; }; 
-        }
-      )
-    ];
-
-  # <configuration below omitted>
-}
-```
-
-Finally, to add our binary cache (optional), add the following to any NixOS module in your configuration
-(e.g. configuration.nix):
-
-```nix
-{
-  nix.settings.extra-substituters = [
-    "https://cache.lix.systems"
-  ];
-
-  nix.settings.trusted-public-keys = [
-    "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
-  ];
-}
-```
-
-Rebuild and switch into your new system (either using `nixos-rebuild` or `darwin-rebuild`).
-You should now be using Lix! You can verify this by asking the `nix` command to report its version:
-
-```sh
-$ nix --version
-nix (Lix, like Nix) 2.90.0-beta.0
-```
-
-As long as you see `Lix` in the output, you're good! If you're not sure what to do now, it's a
-great time to check out some of the [community's resources on Nix](/resources).
-
-## Having Trouble?
-
-**One quick thing to check:** have you set `nix.package` anywhere in your configuration?   
-If so, your configuration option will override the Lix module. You'll want to remove it, first -- 
-or, if you're feeling savvy, point it to the provided Lix package.
-
-**Otherwise:** If you're having difficulty installing Lix, don't panic! Hop on over to our
-[community page](/community), and check out the various ways to find help.

content/install.md

@@ -5,11 +5,95 @@ date: "2024-04-27"
 author: "Lix Team"
 ---
 
-**Not yet available.**
+Whether you're a new or returning user, **we're thrilled you've decided to pick up Lix!**
 
-This install page is currently hidden until this website officially launches. We appreciate how excited you must be,
+Lix works out-of-the-box on most Linux and MacOS systems, including with system management tools
-given you've found this site ahead of time! Thanks for your support and patience. <3
+such as [home-manager](https://github.com/nix-community/home-manager) and 
+[nix-darwin](https://github.com/LnL7/nix-darwin) -- but, like any Nix-based system, some Nix background
+knowledge is recommended before installation.
 
-<small><small>
+If you're new to the Nix ecosystem, you may want to check out some [community resources](/resources)
-_Psst! If you're in our beta and want to peek at the instructions ahead of time, they're in the git repo for this website._
+first, to get familiar with how Nix works.
-</small></small>
+
+
+## On NixOS
+
+If you haven't already installed NixOS, do so using any upstream 
+[install image](https://nixos.org/download/#NixOS) and the instructions in the 
+[NixOS Manual](https://nixos.org/manual/nixos/stable/#sec-installation). Then, follow 
+the instructions for either:
+
+- [flake-based configurations](/add-to-config#flake-based-configurations); or
+- [non-flake configurations](/add-to-config#non-flake-configurations)
+
+depending on how you prefer to configure your system.
+
+
+## On an Existing `nix-darwin` Install
+
+If you already have a [nix-darwin](https://github.com/LnL7/nix-darwin) installation, you
+can use the same instructions as installing on a NixOS-based system. Follow the instructions
+for either:
+
+- [flake-based configurations](/add-to-config#flake-based-configurations); or
+- [non-flake configurations](/add-to-config#non-flake-configurations)
+
+depending on how you prefer to configure your system.
+
+
+## On Any Other Linux/MacOS System
+
+You can either perform a **new install**, or choose to 
+**upgrade an existing install** to Lix.
+
+### New Installs
+
+The easiest way to install Lix is to use the [Lix Installer](https://git.lix.systems/lix-project/lix-installer)[^1].
+Open a terminal, and run the following command:
+
+```sh
+curl -sSf -L https://install.lix.systems/lix | sh -s -- install
+```
+
+The installer will guide you through installing Lix -- and once it's finished, 
+you'll have a full, working installation. If you're not sure what to do, now is a
+great time to check out some of the [community's resources on Nix](/resources).
+
+[^1]: a customized variant of the [Determinate Nix Installer](https://github.com/DeterminateSystems/nix-installer).
+
+### Existing Installs
+
+If you have an existing Nix installation, you should be able to upgrade by using a variant
+of the `upgrade-nix` command.
+
+Thanks to Nix, we can actually ask Lix to upgrade your system directly. Run the following command:
+
+```sh
+sudo nix run \
+     --experimental-features "nix-command flakes" \
+     --extra-substituters https://cache.lix.systems \
+     --trusted-public-keys "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" \
+     'git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.0' -- \
+     upgrade-nix
+```
+
+You should now have upgraded to Lix! You can verify this by asking the `nix` command
+to report its version:
+
+```sh
+$ nix --version
+nix (Lix, like Nix) 2.90.0-beta.1
+```
+
+As long as you see `Lix` in the output, you're good! If you're not sure what to do now, it's a
+great time to check out some of the [community's resources on Nix](/resources).
+
+## Having Trouble?
+
+If you're having difficulty installing Lix, don't panic! Hop on over to our
+[community page](/community), and check out the various ways to find help.
+
+## Feedback?
+
+If you have thoughts on these instructions, feel free to drop by our [community](/community),
+or to [make a pull request to our website](git@git.lix.systems:lix-project/lix-website.git)!

content/install_actual.md

@@ -1,100 +0,0 @@
----
-title:  "Installing Lix"
-description: "or: how to make your configuration Delicious"
-date: "2024-04-27"
-author: "Lix Team"
----
-
-Whether you're a new or returning user, **we're thrilled you've decided to pick up Lix!**
-
-Lix works out-of-the-box on most Linux and MacOS systems, including with system management tools
-such as [home-manager](https://github.com/nix-community/home-manager) and 
-[nix-darwin](https://github.com/LnL7/nix-darwin) -- but, like any Nix-based system, some Nix background
-knowledge is recommended before installation.
-
-If you're new to the Nix ecosystem, you may want to check out some [community resources](/resources)
-first, to get familiar with how Nix works.
-
-
-## On NixOS
-
-If you haven't already installed NixOS, do so using any upstream 
-[install image](https://nixos.org/download/#NixOS) and the instructions in the 
-[NixOS Manual](https://nixos.org/manual/nixos/stable/#sec-installation). Then, follow 
-the instructions for either:
-
-- [flake-based configurations](/add-to-config#flake-based-configurations); or
-- [non-flake configurations](/add-to-config#non-flake-configurations)
-
-depending on how you prefer to configure your system.
-
-
-## On an Existing `nix-darwin` Install
-
-If you already have a [nix-darwin](https://github.com/LnL7/nix-darwin) installation, you
-can use the same instructions as installing on a NixOS-based system. Follow the instructions
-for either:
-
-- [flake-based configurations](/add-to-config#flake-based-configurations); or
-- [non-flake configurations](/add-to-config#non-flake-configurations)
-
-depending on how you prefer to configure your system.
-
-
-## On Any Other Linux/MacOS System
-
-You can either perform a **new install**, or choose to 
-**upgrade an existing install** to Lix.
-
-### New Installs
-
-The easiest way to install Lix is to use the [Lix Installer](https://git.lix.systems/lix-project/lix-installer)[^1].
-Open a terminal, and run the following command:
-
-```sh
-curl -sSf -L https://install.lix.systems/lix | sh -s -- install
-```
-
-The installer will guide you through installing Lix -- and once it's finished, 
-you'll have a full, working installation. If you're not sure what to do, now is a
-great time to check out some of the [community's resources on Nix](/resources).
-
-[^1]: a customized variant of the [Determinate Nix Installer](https://github.com/DeterminateSystems/nix-installer).
-
-### Existing Installs
-
-If you have an existing Nix installation, you should be able to upgrade by using a variant
-of the `upgrade-nix` command.
-
-<mark>
-<b>This section is currently pending on a pull request, so these instructions are for proofreading only.</b>
-</mark>
-<br/>
-<br/>
-
-Thanks to Nix, we can actually ask Lix to upgrade your system directly. Run the following command:
-
-```sh
-sudo nix run --experimental-features "nix-command flakes" --extra-substituters https://cache.lix.systems --trusted-public-keys "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" 'git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.0' -- upgrade-nix
-```
-
-You should now have upgraded to Lix! You can verify this by asking the `nix` command
-to report its version:
-
-```sh
-$ nix --version
-nix (Lix, like Nix) 2.90.0-beta.0
-```
-
-As long as you see `Lix` in the output, you're good! If you're not sure what to do now, it's a
-great time to check out some of the [community's resources on Nix](/resources).
-
-## Having Trouble?
-
-If you're having difficulty installing Lix, don't panic! Hop on over to our
-[community page](/community), and check out the various ways to find help.
-
-## Feedback?
-
-If you have thoughts on these instructions, feel free to drop by our [community](/community),
-or to [make a pull request to our website](git@git.lix.systems:lix-project/lix-website.git)!

content/team.md

@@ -50,7 +50,7 @@ Members (in alphabetical order):
   Raito is working on nixpkgs packaging, infrastructure, and review in Lix. 
   They are a Tvix developer focusing on the store and the evaluator.
 
-- **wiggles ([@9999years](https://github.com/9999years), she/her)**
+- **Rebecca Turner ([@9999years](https://github.com/9999years), she/her)**
 
 <br/>
 
@@ -117,7 +117,7 @@ conflicts of interest.
   aiming to promote the parisian Ecole Normale Superieure (45 rue d'Ulm, 75005 Paris) excellence on computer 
   science using heavily Nix/NixOS based technologies.
 
-- **wiggles** works for mercury.com, a company that uses nix to build software. **Should a governance decision involving these or any other financial ties arise, wiggles will recuse herself from the relevant decision-making.**
+- **Rebecca Turner** works for mercury.com, a company that uses nix to build software. **Should a governance decision involving these or any other financial ties arise, wiggles will recuse herself from the relevant decision-making.**
 
 <br />
 

themes/lix/assets/scss/sections/blog-single.scss

@@ -1,5 +1,6 @@
 .blog-content {
   max-width: 900px;
+  min-width: 100px;
 
   .highlight {
     pre {

themes/lix/assets/scss/sections/hero.scss

@@ -7,6 +7,12 @@
     //   }
     // }
   }
+
+  @media (max-width: 400px) {
+	padding-top: 0 !important;
+	padding-bottom: 0 !important;
+  }
+
   .hero-title {
     strong {
       color: $danger;

themes/lix/assets/scss/sections/portfolio.scss

@@ -4,4 +4,13 @@
       flex-direction: row-reverse;
     }
   }
+
+  img {
+	margin-left: auto;
+	margin-right: auto;
+
+	@media (max-width: 900px) {
+	  margin-bottom: 3rem;
+	}
+  }
 }