config: fix typo "licenced"

make sure to:
  rm -rf public/ resources/_gen/
scraped from git.lix.systems

TODO.md

@@ -3,25 +3,31 @@ TODO List
 
 ## Misc
 
-- Figure out what to replace the location section with.
+- Move "The Team" to under community
-- Fill out the "contact us" section on the main page.
+- Fix the favicon
-- Figure out any legalese we need on the main page.
+- Remove the "pending pull request" from the install page, once that's merged.
 - Add social media icons below lix for mastodon/github/etc.
+- Figure out where "usability" should link to.
 
 ## Pages
 
-- Create the `/install` page.
+- Create the `/resources` page, with resources for learning Nix.
-- Create a subsection for using Lix on existing NixOS, and link it to the box.
-- Create the `/about` page.
-- Create a "Why Lix" section on `/about` and link to it.
-- Figure out where to link the "Docs" link to.
 - Create a /community page linking to matrix.
-- Create /roadmap.
+- Link "/contributing" to... maybe the wiki?
-- Create /infrastructure.
+- Figure out where to link the "Docs" link to, and uncomment it.
 
 ## Graphics
 
-- Fix the fact that Hugo is sticking the wrong thing into the alt text.
+- Fix the fact that Hugo is sticking the wrong thing into the alt texts.
 - Replace the primary "hero" graphic with a Lix one.
 - Replace the "lix-managed systems" graphic with an image of our logo on a screen.
 - Replace the placeholders for each of the three main page "why lix" points.
+- Add nice images to the "/about" page.
+
+# Wishlist
+
+- Fix the way CSS makes the page look on narrower monitors
+- Fix the CSS vertical alignment on webkit mobile
+- Screenshots (incl. maybe of Xil) showing ergonomics enhancements in the /about page.
+- Create /roadmap.
+- Create /infrastructure.

config.yaml

@@ -10,7 +10,7 @@ summaryLength: 20
 
 params:
   title: "Lix"
-  description: "Lix is an independent varaint of the Nix package manager, developed by a team of open-source volunteers, and maintained by and for a passionate community of users."
+  description: "Lix is an independent variant of the Nix package manager, developed by a team of open-source volunteers, and maintained by and for a passionate community of users."
   images: 
     - "images/hero-image.png"
 
@@ -24,13 +24,11 @@ params:
   social:
     twitter: "https://twitter.com/LixProject"
 
-  location:
-    - ""
-
   contact:
-    - "info@lix.systems"
+    - "General Inquiries: info@lix.systems"
+    - "Security Reports: security@lix.systems"
 
-  copyright: "Content licenced under CC-BY-SA-4.0 or LGPL-2.0-or-later."
+  copyright: "Content licensed under CC-BY-SA-4.0 or LGPL-2.0-or-later."
 
 menus:
   main:
@@ -42,54 +40,80 @@ menus:
       url: "/about"
       weight: 2
 
-    - name: "Code"
+    - name: "The Team"
-      url: "https://git.lix.systems/lix-project/lix"
+      url: "/team"
       weight: 3
 
-    - name: "Docs"
+        #- name: "Docs"
-      url: "/#"
+        #  url: "/#"
-      weight: 4
+        #  weight: 4
+
+    - name: "Resources"
+      url: "/resources"
+      weight: 5
 
     - name: "Community"
       url: "/community"
-      weight: 5
+      weight: 6
+
+    - name: "Code"
+      url: "https://git.lix.systems/lix-project/lix"
+      weight: 7
 
     - name: "Wiki"
-      url: "https://wiki.lix.systems"
+      url: "https://wiki.lix.systems/books"
-      weight: 6
+      weight: 8
 
   buttons:
     - name: "Install Lix"
-      url: "/#"
+      url: "/install"
       weight: 5
       pre: "btn btn-primary text-light"
 
-  footer:
+  aboutus:
+    - name: "Why Lix?"
+      url: "/about#why-lix"
+      weight: 1
+
     - name: "About Lix"
       url: "/about"
       weight: 2
 
-    - name: "Source Repositories"
-      url: "https://git.lix.systems"
     - name: "The Lix Team"
       url: "/team"
-      weight: 3
-
-      weight: 3
-
-    - name: "Documentation"
-      url: "/#"
       weight: 4
 
-    - name: "Community"
+    - name: "FAQs"
-      url: "/community"
+      url: "/about#frequently-asked-questions-relatively-speaking"
       weight: 5
 
+  resources:
+
     - name: "Wiki"
       url: "https://wiki.lix.systems"
-      weight: 6
+      weight: 1
+
+    - name: "Community"
+      url: "/community"
+      weight: 2
+
+    - name: "Nix Resources"
+      url: "/resources"
+      weight: 2
+
+    - name: "Source Repositories"
+      url: "https://git.lix.systems"
+      weight: 4
 
 
 taxonomies:
   series: "series"
   tags: "tags"
+
+markup:
+  goldmark:
+    renderer:
+      unsafe: true
+
+  highlight:
+    style: manni

content/about.md

@@ -1,25 +1,123 @@
-+++
+---
-title = "About"
+title:  "About Lix"
-description = "Hugo, the world's fastest framework for building websites"
+description: "A strictly-better implementation of the Nix language."
-date = "2019-02-28"
+date: "2024-04-27"
-aliases = ["about-us", "about-hugo", "contact"]
+author: "Lix Team"
-author = "Hugo Authors"
+---
-+++
 
-Written in Go, Hugo is an open source static site generator available under the [Apache Licence 2.0.](https://github.com/gohugoio/hugo/blob/master/LICENSE) Hugo supports TOML, YAML and JSON data file types, Markdown and HTML content files and uses shortcodes to add rich content. Other notable features are taxonomies, multilingual mode, image processing, custom output formats, HTML/CSS/JS minification and support for Sass SCSS workflows.
+**Lix** is an implementation of the Nix _functional package management_ language. Originally
+codified by [CppNix](https://github.com/NixOS/nix/), the Nix language allows you to create
+packages that can be used for anything from **putting configuration files into place** to 
+**declaratively managing an entire system**. 
 
-Hugo makes use of a variety of open source projects including:
+That means that, with a few well-written Nix expressions, one 
+can easily configure a system into a known state -- and the packages that are created this
+way are guaranteed to run _exactly the same way_ on any system of the same architecture.
 
-* https://github.com/yuin/goldmark
+As a fork of CppNix, Lix is designed to be fully compatible with the original CppNix 
-* https://github.com/alecthomas/chroma
+implementation -- but also designed to allow evolution of the language and tooling, so
-* https://github.com/muesli/smartcrop
+its developers can improve usability and ergonomics without sacrificing correctness.
-* https://github.com/spf13/cobra
-* https://github.com/spf13/viper
 
-Hugo is ideal for blogs, corporate websites, creative portfolios, online magazines, single page applications or even a website with thousands of pages.
+### Why use Nix?
 
-Hugo is for people who want to hand code their own website without worrying about setting up complicated runtimes, dependencies and databases.
+If you're not familiar with the Nix approach, we recommend checking out some of the 
+[writing on the subject](https://nixos.org/guides/nix-pills/01-why-you-should-give-it-a-try.html).
 
-Websites built with Hugo are extremely fast, secure and can be deployed anywhere including, AWS, GitHub Pages, Heroku, Netlify and any other hosting provider.
 
-Learn more and contribute on [GitHub](https://github.com/gohugoio).
+## Why Lix?
+
+The **Nix language** is used for a variety of applications ranging from individual computers
+to clusters of critical infrastructure. With this in mind, the Lix team has been working to
+provide a collection of necessary improvements over CppNix:
+
+- **Built for a community, not for a corporation.**  
+  Lix is built by a team of open-source volunteers -- and exists to provide a alternative to the
+  commercial interests that have long plagued both upstream CppNix and corporate-authored forks.
+  We're proud to stand by our open [conflict of interest statements](/team#conflict-of-interest-statements),
+  and proud to listen to community voices on issues of sponsorship, direction, and moderation.
+
+- **A safe community for developers of all backgrounds.**  
+  Lix is developed by a diverse group of users -- and accordingly is committed to providing a
+  space that's safe for users and developers typically underrepresented in technical projects.
+  We take moderation seriously, and are committed to preventing bad actors from driving out 
+  marginalized groups.
+
+- **A correct implementation of the Nix language.**  
+  Recent versions of the CppNix project have introduced significant regressions -- so much so
+  that the upstream [Nixpkgs](https://github.com/nixos/nixpkgs) team has opted to remain several
+  versions behind. Lix is forked from the last truly-stable version of CppNix -- but has both
+  introduced new features and backported a number of features from newer versions without
+  sacrificing correctness.
+
+- **A more modern implementation of Nix.**  
+  Lix is designed for evolution of its codebase. Lix already uses the more modern 
+  [meson build system](https://mesonbuild.com/), which improves developer usability and decreases build times. 
+  Plans include a gradual, piecewise introduction of the memory-safe [Rust](https://www.rust-lang.org/)
+  programming language -- to both supplement and replace sections of the current C++ codebase. 
+
+- **A language with room to grow.**  
+  Unlike upstream Nix, Lix intends to be an evolving language -- a robust [language versioning](/roadmap)
+  system will allow the language to grow and evolve without sacrificing backwards-compatibility or correctness.
+  And room to grow means room for [usability and ergonomics improvements](#) -- both in the langauge and in
+  tooling.
+  
+## Frequently Asked Questions (relatively speaking)
+
+#### Q: Can I use my existing Nix/NixOS configuration?
+
+Absolutely. A primary goal of the Lix project is compatibility, which means that we very much support
+using Lix in any existing Nix or NixOS configuration.
+
+Check out the [install page](/install) to see how to use Lix with your existing configurations.
+
+#### Q: What are your plans for flakes?
+
+One of our primary goals is compatibility. While flakes are an experimental technology, their use is
+widespread enough that they've become a de-facto part of the Nix ecosystem -- and thus we consider them
+to be part of our compatibility guarantee.
+
+That said, we're not tied to any particular flake implementation. As Lix develops, we plan on adding an
+extension system for the tooling -- which will allow technologies like flakes, as well as new and different
+extensions -- to seamlessly act with the Lix core without needing to reside long-term in the Lix tree.
+
+
+#### Q: What relation does Lix have to the Nix Foundation, and to related projects?
+
+Besides being a fork of CppNix and an implementation of the Nix language, Lix is the
+effort of a number of long-time Nix, Nixpkgs, NixOS, and Tvix contributors and maintainers -- and has
+been developed in partnership with a number of prolific Nix-documenters, bloggers, and users.
+
+We welcome anyone who wants to develop for both Lix and another implementation -- including CppNix and _Tvix_,
+and our open-source implementation absolutely allows any developer to integrate our code into any 
+license-compatible project.
+
+However, ___Lix does not fall under the NixOS Foundation umbrella___, is funded independently of the foundation,
+and is not in any way controlled by its leadership. Unfortunately, at the moment, this is vital for 
+us to deliver on our promise of a safe and inclusive community.
+
+
+#### Q: If Lix plans to adopt Rust, what makes it different from Tvix?  
+
+Unlike Lix, [Tvix](https://tvix.dev/) is a ground-up re-implementation of the Nix language in Rust,
+which shares many of the same modernization goals as Lix -- but also has a long way to go before it can
+reach feature parity (and parity in correctness) with the CppNix and Lix implementations.
+
+Lix instead plans a _top-down_, _piecewise_ approach to our Rust extensions and replacements -- which means
+that Lix already has feature-parity with -- and correctness exceeding -- the original CppNix.
+
+
+#### Q: What does the name Lix stand for? How is it pronounced?
+
+Like Nix, Lix isn't really short for anything. The name originally derives from the term _Layered Nix_,
+based on the premise of layering new language and tooling features atop a fully-compatible, rock-solid base.
+
+Lix is pronounced like _licks_ -- i.e. what you might do if someone handed you a delicious ice cream cone;
+which may or may not be stacked up with lambdas.
+
+
+#### Q: Can I help?
+
+Absolutely! We love new contributors, and are always looking for contributions in all of our areas -- and
+we value contributions of more than just code. 
+
+Head over to the [contributing](/contributing) page to get started.

content/add-to-config.md

@@ -0,0 +1,153 @@
+---
+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>
+  }
+}
+```
+
+Finally, 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>
+}
+```
+
+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-lix
+```
+
+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>
+}
+```
+
+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-lix
+```
+
+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/community.md

@@ -0,0 +1,7 @@
+---
+title:  "Lix Community"
+description: "it's not an ice cream party, but it might as well be"
+date: "2024-04-27"
+author: "Lix Team"
+---
+

content/install.md

@@ -0,0 +1,101 @@
+---
+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 [Determinant 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 --extra-experimental-features "nix-command flakes" \
+   "git+https://git.lix.systems/lix-project/lix" -- 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-lix
+```
+
+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/resources.md

@@ -0,0 +1,7 @@
+---
+title:  "Nix Resources"
+description: "community resources we recommend for getting started or learning more"
+date: "2024-04-27"
+author: "Lix Team"
+---
+

content/team.md

@@ -0,0 +1,100 @@
+---
+title:  "The Team"
+description: ""
+date: "2024-04-27"
+author: "Lix Team"
+---
+
+**Lix** is developed by a community of passionate users! We have no "benevolent dictator for life",
+nor a small foundation board that governs the community. Instead, we rely on teams of our developers
+and users to carry the burdens of maintenance and governance.
+
+## Core Team
+
+The **core team** are the developers most directly responsible for the Lix project. While the project
+is in its "soft-release" period, these folks are responsible for project governance. One of their main
+tasks is to establish a lasting governance model -- and other teams to handle things!
+
+Members (in alphabetical order):
+
+- **hexchen ([@hexchen](https://github.com/hexchen), she/her)**  
+  hexchen is working primarily on mantaining and extending the Lix project infrastructure.
+
+- **Irenes ([@IreneKnapp](https://github.com/IreneKnapp), they/them)**
+
+- **jade ([@lf-](https://github.com/lf-), they/them)**  
+  jade is working on packaging, testing, infrastructure, tooling, review, stability, and a large amount of 
+  the writing in Lix. They recently graduated from a Computer Engineering program at UBC in Canada.
+
+- **Kate Temkin ([@ktemkin](https://github.com/ktemkin), she/her [singular] or they/them [plural])**  
+  A performance art piece written live by a collective of hardware hackers & low-level engineers. 
+  Kate works on Lix as part of a commitment to helping you do cool things, and is seriously considering
+  rewriting every bit of documentation ever to cross paths with Nix.
+- **Lily ([@lilyinstarlight](https://github.com/lilyinstarlight), she/they)**
+
+- **Lunaphied ([@Lunaphied](https://github.com/lunaphied), she/her [singular] or they/them [plural])**  
+  Lunaphied spend a disproportionate amount of their time considering how to get FPGAs as far from Earth as possible.
+  When they're not working on Space Stuff, they consider doing the same for Nix regressions.
+
+- **pennae (aka "eldrich horrors", they/them)**
+
+- **puck ([@puckipedia](https://github.com/puckipedia), she/her)**
+
+- **Qyriad ([@Qyriad](https://github.com/Qyriad), she/her [singular] or they/them [plural])**  
+  Build system experts who delve way, way too deep into tooling -- so you don't have to. 
+
+- **raito ([@RaitoBezarius](https://github.com/RaitoBezarius), he/they)**  
+  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)**
+
+<br/>
+
+We all hang around in [community spaces](/community), including on Matrix. Feel free to pop into
+the Lix channels and say hello -- we'd love to hear what you think of Lix!
+
+## Conflict of Interest Statements
+
+As a community project, it's important that project decisions are made **exclusively for the
+benefit of the community**, and don't serve any other interests -- including personal or corporate gain.
+
+If a team member is unable to do so in any context, they are **required** to disclose the _conflict of interest_
+and to recuse themselves from any leadership decisions affected.
+
+As transparency is important, we've included declarations from each core team member regarding any possible
+conflicts of interest.
+
+- **hexchen** <mark>TODO</mark>
+
+- **Irenes** <mark>TODO</mark>
+
+- **jade** <mark>TODO</mark>
+
+- **Kate Temkin** is the CEO and one-third owner of **Tactile Metrology LLC (TMLLC)**, a company that currently 
+  sponsors Lix development. TMLLC declares that it has no financial stake in the future of Lix or Nix,
+  no ties to the military-industrial-complex, and a strong commitment to avoiding such ties. TMLLC is
+  owned by individuals, and not VC investors. Kate accordingly declares she has **no conflicts of interest**
+  regarding governance of Lix.
+
+- **Lunaphied** declare that they have **no conflicts of interest** regarding the governance of Lix.
+
+- **pennae** <mark>TODO</mark>
+
+- **puck** <mark>TODO</mark>
+
+- **Qyriad** is a one-third owner of **Tactile Metrology LLC (TMLLC)**, a company that currently 
+  sponsors Lix development. TMLLC declares that it has no financial stake in the future of Lix or Nix,
+  no ties to the military-industrial-complex, and a strong commitment to avoiding such ties. TMLLC is
+  owned by individuals, and not VC investors. Qyriad accordingly declares she has **no conflicts of interest**
+  regarding governance of Lix.
+
+- **raito** <mark>TODO</mark>
+
+- **wiggles** <mark>TODO</mark>
+
+<br />
+
+These declarations were last updated on **April 27th, 2024**, and are believed to be up-to-date to the current date. 
+If the bolded date is more than 28 days in the past, feel free to reach out via our 
+[community channels](/community) to request these declarations be updated.

data/home/ecosystem.yaml

@@ -24,4 +24,4 @@ content:
       text: "Lix can also be used as the core Nix implementation for Nix-based operating systems and system managers, including the full NixOS distribution, as well as system management software like Home Manager or nix-darwin."
       button:
         label: "use lix with NixOS"
-        url: "/install"
+        url: "/add-to-config"

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

@@ -7,4 +7,29 @@
       border-radius: 8px;
     }
   }
+
+  h2 {
+	margin-top: 3rem;
+	margin-bottom: 1rem;
+	color: $primary;
+  }
+
+  h3 {
+	margin-top: 2rem;
+	color: $danger;
+	font-size: inherit;
+	font-weight: 600;
+  }
+
+
+  h4 {
+	font-size: inherit;
+	font-weight: bold;
+	margin-top: 2rem;
+  } 
+
+  div.footnotes {
+	margin-top: 5rem;
+	filter: opacity(60%);
+  }
 }

themes/lix/assets/scss/sections/ecosystem.scss

@@ -1,11 +1,17 @@
-.ecosystem img.raster {
+.ecosystem {
-	margin-left: auto;
+	& img.raster {
-	margin-right: auto;
+		margin-left: auto;
-	width: 40%;
+		margin-right: auto;
-}
+		width: 40%;
+	}
 
-.ecosystem img.svg {
+	& img.svg {
-	margin-left: auto;
+		margin-left: auto;
-	margin-right: auto;
+		margin-right: auto;
-	width: 60%;
+		width: 60%;
+	}
+
+	& .card {
+		height: 100%;
+	}
 }

themes/lix/assets/scss/shared/_buttons.scss

@@ -0,0 +1,3 @@
+.btn-primary.text-light {
+	font-weight: 600;
+}

themes/lix/assets/scss/shared/shared.scss

@@ -5,6 +5,7 @@
 
 @import "header";
 @import "footer";
+@import "buttons";
 
 @import "../sections/hero";
 @import "../sections/brands";

themes/lix/layouts/partials/head/_favicons.html

@@ -4,7 +4,7 @@
 {{- end -}}
 {{- $favicon = slice $favicon | resources.Concat "favicon.ico" -}}
 
-{{- $logo := resources.Get "images/logo.png" -}}
+{{- $logo := resources.Get "images/favicon.png" -}}
 {{- with .Site.Params.logo -}}
   {{- with resources.Get . -}}
     {{- $logo = . -}}

themes/lix/layouts/partials/shared/footer.html

@@ -16,7 +16,7 @@
       <div class="col-12 col-xl-2 text-center text-xl-start pb-4">
         <h5 class="fs-6 fw-semibold text-primary">About us</h5>
         <ul class="list-unstyled">
-          {{ range .Site.Menus.footer }}
+          {{ range .Site.Menus.aboutus }}
             <li class="">
               <a class="small text-black-61 text-decoration-none" href="{{ .URL }}">{{ .Name }}</a>
             </li>
@@ -24,18 +24,17 @@
         </ul>
       </div>
       <div class="col-12 col-xl-3 text-center text-xl-start pb-4">
-        <h5 class="fs-6 fw-semibold text-primary">Location</h5>
+        <h5 class="fs-6 fw-semibold text-primary">Resources</h5>
         <ul class="list-unstyled">
-          {{ range .Site.Params.location }}
+          {{ range .Site.Menus.resources }}
-            <li class="d-flex justify-content-center justify-content-xl-start mb-2">
+            <li class="">
-              <div class="d-flex align-items-center text-primary">{{ partial "icons/geo-alt.html" }}</div>
+              <a class="small text-black-61 text-decoration-none" href="{{ .URL }}">{{ .Name }}</a>
-              <p class="small text-black-61 m-0 ps-2">{{ . }}</p>
             </li>
           {{ end }}
         </ul>
       </div>
       <div class="col-12 col-xl-3 text-center text-xl-start pb-4">
-        <h5 class="fs-6 fw-semibold text-primary">Contact us</h5>
+        <h5 class="fs-6 fw-semibold text-primary">Points of Contact</h5>
         {{ range .Site.Params.contact }}
           <p class="small text-black-61 mb-1">{{ . }}</p>
         {{ end }}