diff --git a/TODO.md b/TODO.md new file mode 100644 index 00000000..2715a7b1 --- /dev/null +++ b/TODO.md @@ -0,0 +1,26 @@ +TODO List +========== + +## Misc + +- Figure out what to replace the location section with. +- Fill out the "contact us" section on the main page. +- Figure out any legalese we need on the main page. +- Add social media icons below lix for mastodon/github/etc. + +## Pages + +- 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. +- Figure out where to link the "Docs" link to. +- Create a /community page linking to matrix. +- Create /roadmap. +- Create /infrastructure. + +## Graphics + +- 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. diff --git a/config.yaml b/config.yaml index e74aa7dc..f12dd703 100644 --- a/config.yaml +++ b/config.yaml @@ -69,13 +69,13 @@ menus: url: "/about" weight: 2 + - name: "Source Repositories" + url: "https://git.lix.systems" - name: "The Lix Team" url: "/team" weight: 3 - - name: "Source Repositories" - url: "https://git.lix.systems" - weight: 4 + weight: 3 - name: "Documentation" url: "/#" diff --git a/data/home/ecosystem.yaml b/data/home/ecosystem.yaml new file mode 100644 index 00000000..4f006908 --- /dev/null +++ b/data/home/ecosystem.yaml @@ -0,0 +1,27 @@ +enabled: true +id: "ecosystem" + +content: + title: "The Lix Ecosystem" + text: "Like other Nix ecosystems, Lix layers together multiple projects to create a full Lix stack — allowing you to forge your own systems on a base of community work." + cards: + - image: "images/ecosystem-lix.png" + title: "The Lix Package Manager" + text: "The ecosystem's core is the Lix package manager — a community variant of the Nix configuration language and package management system." + button: + label: "view the code" + url: "https://git.lix.systems/lix-project/lix" + + - image: "images/ecosystem-nixpkgs.svg" + title: "Community Packages" + text: "Lix is fully compatible with existing Nix expressions — which means it benefits from the hundreds of thousands of existing community-maintained packages and configurations." + button: + label: "visit nixpkgs" + url: "https://github.com/nixos/nixpkgs" + + - image: "images/ecosystem-nixpkgs.svg" + title: "Lix-Managed Systems" + 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" diff --git a/data/home/portfolio.yaml b/data/home/portfolio.yaml index 444c9b11..b263bf0e 100644 --- a/data/home/portfolio.yaml +++ b/data/home/portfolio.yaml @@ -2,38 +2,31 @@ enabled: true id: "portfolio" content: - - image: "images/portfolio-ecommerce.png" - pretitle: "Portfolio Service" - title: "We developed an eCommerce website" - text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque sed euismod quis sit gravida pharetra sit. Cursus vel enim pretium vulputate semper sem elit magna neque. Aliquet adipisc." + + - image: "images/services-web-development.png" + pretitle: "nix with a modern flavor" + title: "an ever-evolving lix codebase, for a language that can evolve" + text: "Lix is designed to grow and evolve — in a way that never breaks backwards compatibility. Lix intends to support language versioning features — so we can continuously improve the language without affecting existing configurations." buttons: - - label: "See live" - url: "#" + - label: "see our roadmap" + url: "/roadmap" - - label: "Read more" - url: "#" - - image: "images/portfolio-ecommerce.png" - pretitle: "Portfolio Service" - title: "We developed an eCommerce website" - text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque sed euismod quis sit gravida pharetra sit. Cursus vel enim pretium vulputate semper sem elit magna neque. Aliquet adipisc." + - image: "images/services-web-development.png" + pretitle: "an independent ecosystem" + title: "community-owned infrastructure" + text: "Lix is designed to avoid ecosystem lock-in: you can build and use Lix without any dependency on corporate-controlled infrastructure, like Microsoft's GitHub." buttons: - - label: "See live" + - label: "read about our infrastructure" url: "#" - - label: "Read more" - url: "#" - - - image: "images/portfolio-ecommerce.png" - pretitle: "Portfolio Service" - title: "We developed an eCommerce website" - text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Quisque sed euismod quis sit gravida pharetra sit. Cursus vel enim pretium vulputate semper sem elit magna neque. Aliquet adipisc." + - image: "images/services-web-development.png" + pretitle: "a human-friendly implementation" + title: "a configuration language for everyone — human or otherwise" + text: "Declarative configurations may run on machines — but their interface shouldn't be designed for them! The Lix team is constantly working on usability and ergonomics enhancements — including tools that let you better see and interact with your configuration." buttons: - - label: "See live" - url: "#" - - - label: "Read more" - url: "#" + - label: "see existing & proposed improvements" + url: "/roadmap" diff --git a/data/home/services.yaml b/data/home/services.yaml deleted file mode 100644 index 527f7aa3..00000000 --- a/data/home/services.yaml +++ /dev/null @@ -1,27 +0,0 @@ -enabled: true -id: "services" - -content: - title: "Our main services" - text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nec quam nibh elit pellentesque velit netus suspendisse. Sed enim, pretium, montes, in ut dolor urna." - cards: - - image: "images/services-web-development.png" - title: "Web development" - text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Molestie in malesuada eget fames purus ligula luctus tellus. Habitant condimentum sit gravida praesent. " - button: - label: "Learn more" - url: "#" - - - image: "images/services-web-development.png" - title: "Web development" - text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Molestie in malesuada eget fames purus ligula luctus tellus. Habitant condimentum sit gravida praesent. " - button: - label: "Learn more" - url: "#" - - - image: "images/services-web-development.png" - title: "Web development" - text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Molestie in malesuada eget fames purus ligula luctus tellus. Habitant condimentum sit gravida praesent. " - button: - label: "Learn more" - url: "#" diff --git a/themes/lix/assets/images/ecosystem-lix.png b/themes/lix/assets/images/ecosystem-lix.png new file mode 100644 index 00000000..f8ad3d13 Binary files /dev/null and b/themes/lix/assets/images/ecosystem-lix.png differ diff --git a/themes/lix/assets/images/ecosystem-nixpkgs.svg b/themes/lix/assets/images/ecosystem-nixpkgs.svg new file mode 100644 index 00000000..788c3c2f --- /dev/null +++ b/themes/lix/assets/images/ecosystem-nixpkgs.svg @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/themes/lix/assets/scss/sections/ecosystem.scss b/themes/lix/assets/scss/sections/ecosystem.scss new file mode 100644 index 00000000..9f6b2b3a --- /dev/null +++ b/themes/lix/assets/scss/sections/ecosystem.scss @@ -0,0 +1,11 @@ +.ecosystem img.raster { + margin-left: auto; + margin-right: auto; + width: 40%; +} + +.ecosystem img.svg { + margin-left: auto; + margin-right: auto; + width: 60%; +} diff --git a/themes/lix/assets/scss/sections/services.scss b/themes/lix/assets/scss/sections/services.scss deleted file mode 100644 index e69de29b..00000000 diff --git a/themes/lix/assets/scss/shared/shared.scss b/themes/lix/assets/scss/shared/shared.scss index 3445a16c..b7893365 100644 --- a/themes/lix/assets/scss/shared/shared.scss +++ b/themes/lix/assets/scss/shared/shared.scss @@ -9,7 +9,7 @@ @import "../sections/hero"; @import "../sections/brands"; @import "../sections/portfolio"; -@import "../sections/services"; +@import "../sections/ecosystem"; @import "../sections/testimonials"; @import "../sections/cta"; diff --git a/themes/lix/layouts/index.html b/themes/lix/layouts/index.html index b6c04d4e..d8724e18 100644 --- a/themes/lix/layouts/index.html +++ b/themes/lix/layouts/index.html @@ -1,8 +1,5 @@ {{ define "main" }} {{ with .Site.Data.home.hero }}{{ partial "sections/hero.html" . }}{{ end }} - {{ with .Site.Data.home.brands }}{{ partial "sections/brands.html" . }}{{ end }} + {{ with .Site.Data.home.ecosystem }}{{ partial "sections/ecosystem.html" . }}{{ end }} {{ with .Site.Data.home.portfolio }}{{ partial "sections/portfolio.html" . }}{{ end }} - {{ with .Site.Data.home.services }}{{ partial "sections/services.html" . }}{{ end }} - {{ with .Site.Data.home.testimonials }}{{ partial "sections/testimonials.html" . }}{{ end }} - {{ with .Site.Data.home.cta }}{{ partial "sections/cta.html" . }}{{ end }} {{ end }} diff --git a/themes/lix/layouts/partials/sections/services.html b/themes/lix/layouts/partials/sections/ecosystem.html similarity index 96% rename from themes/lix/layouts/partials/sections/services.html rename to themes/lix/layouts/partials/sections/ecosystem.html index 5a4e770a..35adbd6f 100644 --- a/themes/lix/layouts/partials/sections/services.html +++ b/themes/lix/layouts/partials/sections/ecosystem.html @@ -1,4 +1,4 @@ -
+
diff --git a/themes/lix/layouts/partials/shared/footer.html b/themes/lix/layouts/partials/shared/footer.html index 5e19fd68..d675f503 100644 --- a/themes/lix/layouts/partials/shared/footer.html +++ b/themes/lix/layouts/partials/shared/footer.html @@ -2,7 +2,7 @@
-

{{ .Site.Title }}

+

{{ .Site.Title }}

{{ .Site.Params.description }}

{{ with .Site.Params.social }}
    diff --git a/themes/lix/layouts/partials/utilities/image-fluid.html b/themes/lix/layouts/partials/utilities/image-fluid.html index cf807025..67f3b2c5 100644 --- a/themes/lix/layouts/partials/utilities/image-fluid.html +++ b/themes/lix/layouts/partials/utilities/image-fluid.html @@ -1,3 +1,7 @@ {{ with resources.Get . }} - {{ .Title }} +{{ if eq .MediaType.SubType "svg" }} + {{ .Title }} +{{ else }} + {{ .Title }} +{{ end }} {{ end }}