From 8c524f211208e69c3d70b9793ed3037cad9f81ef Mon Sep 17 00:00:00 2001 From: Kate Temkin Date: Sat, 27 Apr 2024 19:20:05 -0600 Subject: [PATCH] update about and themeing --- TODO.md | 2 +- config.yaml | 6 +-- content/about.md | 39 ++++++++++--------- data/home/ecosystem.yaml | 2 +- .../lix/assets/scss/sections/blog-single.scss | 5 +++ themes/lix/assets/scss/shared/_buttons.scss | 3 ++ themes/lix/assets/scss/shared/shared.scss | 1 + 7 files changed, 34 insertions(+), 24 deletions(-) create mode 100644 themes/lix/assets/scss/shared/_buttons.scss diff --git a/TODO.md b/TODO.md index dd27cf58..ece469c5 100644 --- a/TODO.md +++ b/TODO.md @@ -14,7 +14,6 @@ TODO List - Create the `/install` page. - 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. - Create the /team page and include CoI declarations. - Figure out where to link the "Docs" link to. @@ -28,6 +27,7 @@ TODO List - 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 diff --git a/config.yaml b/config.yaml index 99f4bc3f..ba312dc6 100644 --- a/config.yaml +++ b/config.yaml @@ -46,9 +46,9 @@ menus: url: "https://git.lix.systems/lix-project/lix" weight: 3 - - name: "Docs" - url: "/#" - weight: 4 + #- name: "Docs" + # url: "/#" + # weight: 4 - name: "Community" url: "/community" diff --git a/content/about.md b/content/about.md index 735234e2..d3ae6a56 100644 --- a/content/about.md +++ b/content/about.md @@ -6,7 +6,7 @@ author: "Lix Team" --- **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 +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**. @@ -14,7 +14,7 @@ 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. -As a fork of _cppnix_, Lix is designed to be fully compatible with the original cppnix +As a fork of CppNix, Lix is designed to be fully compatible with the original CppNix implementation -- but also designed to allow evolution of the language and tooling, so its developers can improve usability and ergonomics without sacrificing correctness. @@ -28,11 +28,11 @@ If you're not familiar with the Nix approach, we recommend checking out some of 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_: +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. + commercial interests that have long plagued both upstream CppNix and corporate-authored forks. We're proud to stand by our open [conflict of interest statement](/team#conflicts-of-interest), and proud to listen to community voices on issues of sponsorship, direction, and moderation. @@ -43,9 +43,9 @@ provide a collection of necessary improvements over _cppnix_: marginalized groups. - **A correct implementation of the Nix language.** - Recent versions of the _cppnix_ project have introduced significant regressions -- so much so + 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 + 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. @@ -70,15 +70,6 @@ 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: 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 are your plans for flakes? One of our primary goals is compatibility. While flakes are an experimental technology, their use is @@ -92,19 +83,29 @@ extensions -- to seamlessly act with the Lix core without needing to reside long #### 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 +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 permissive open-source absolutely allows any developer to integrate our code into any +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 currently vital for +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_, diff --git a/data/home/ecosystem.yaml b/data/home/ecosystem.yaml index 4f006908..c59a2a5c 100644 --- a/data/home/ecosystem.yaml +++ b/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: "/install#on-nixos" diff --git a/themes/lix/assets/scss/sections/blog-single.scss b/themes/lix/assets/scss/sections/blog-single.scss index ae5cb6e1..2bf4b221 100644 --- a/themes/lix/assets/scss/sections/blog-single.scss +++ b/themes/lix/assets/scss/sections/blog-single.scss @@ -14,6 +14,11 @@ color: $primary; } + h3 { + margin-top: 2rem; + } + + h4 { font-size: inherit; font-weight: bold; diff --git a/themes/lix/assets/scss/shared/_buttons.scss b/themes/lix/assets/scss/shared/_buttons.scss new file mode 100644 index 00000000..65d98b18 --- /dev/null +++ b/themes/lix/assets/scss/shared/_buttons.scss @@ -0,0 +1,3 @@ +.btn-primary.text-light { + font-weight: 600; +} diff --git a/themes/lix/assets/scss/shared/shared.scss b/themes/lix/assets/scss/shared/shared.scss index b7893365..ba9e5ae9 100644 --- a/themes/lix/assets/scss/shared/shared.scss +++ b/themes/lix/assets/scss/shared/shared.scss @@ -5,6 +5,7 @@ @import "header"; @import "footer"; +@import "buttons"; @import "../sections/hero"; @import "../sections/brands";