From 97a280ae2f293f7c241c88064a3e76f26da06a87 Mon Sep 17 00:00:00 2001 From: Kate Temkin Date: Sun, 5 May 2024 10:13:02 -0600 Subject: [PATCH] patch up images, prepare for pre-soft-release --- TODO.md | 6 +- content/about.md | 4 +- content/community-standards.md | 48 ++- content/resources.md | 2 +- content/team.md | 2 +- data/home/ecosystem.yaml | 2 +- data/home/points.yaml | 13 +- themes/lix/assets/images/ecosystem-nixos.svg | 249 ++++++++++++++ .../assets/images/points-configuration.svg | 192 +++++++++++ themes/lix/assets/images/points-evolution.svg | 312 +++++++++++++++++ .../lix/assets/images/points-selfhosted.svg | 322 ++++++++++++++++++ .../lix/layouts/partials/sections/points.html | 2 +- .../partials/utilities/image-fluid.html | 2 +- 13 files changed, 1134 insertions(+), 22 deletions(-) create mode 100644 themes/lix/assets/images/ecosystem-nixos.svg create mode 100644 themes/lix/assets/images/points-configuration.svg create mode 100644 themes/lix/assets/images/points-evolution.svg create mode 100644 themes/lix/assets/images/points-selfhosted.svg diff --git a/TODO.md b/TODO.md index 6c66320a..cca3c794 100644 --- a/TODO.md +++ b/TODO.md @@ -10,16 +10,13 @@ TODO List ## Soft Release Blockers - Remove the "pending pull request" from the install page, once that's merged. -- Figure out where "usability" should link to. -- Create a `/community-standards` page (jade is creating text) -- Create our contributor guide and squish it onto `/contributing` (raito is providing text). - Replace the favicon with a flavicon (the lix logo). +- Fix the way CSS makes the page look on narrower monitors / mobile phones/ ## After Soft Release ### Misc -- Fix the way CSS makes the page look on narrower monitors - Fix the CSS vertical alignment on webkit mobile - Figure out where to link the "Docs" link to, and uncomment it. @@ -27,6 +24,7 @@ TODO List - Screenshots (incl. maybe of Xil) showing ergonomics enhancements in the /about page. - Create `/roadmap`. +- Create '/usability'. - Create `/infrastructure`. ### Graphics diff --git a/content/about.md b/content/about.md index db8b697b..a808c925 100644 --- a/content/about.md +++ b/content/about.md @@ -56,9 +56,9 @@ provide a collection of necessary improvements over CppNix: 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) + Unlike upstream Nix, Lix intends to be an evolving language -- a robust language versioning 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 + And room to grow means room for **usability and ergonomics improvements** -- both in the langauge and in tooling. diff --git a/content/community-standards.md b/content/community-standards.md index a3f753b7..7069ea76 100644 --- a/content/community-standards.md +++ b/content/community-standards.md @@ -5,11 +5,47 @@ date: "2024-04-27" author: "Lix Team" --- -**Not yet available.** +This is an interim set of Lix Community Standards, to be reviewed and revised further when the governance process is further along. *These standards are in force and will be enforced until that time*. -This page is hidden until this website officially launches. We appreciate how excited you must be, -given you've found this site ahead of time! Thanks for your support and patience. <3 +The following are *principles* and do not in any way limit the authority of the interim community team to remove anyone for any kind of behaviour deleterious to the community. We generally will speak with people to deescalate and help them be excellent members of our community before applying consequences. Patterns of deleterious behaviour will tend to lead to exclusion from the community. - -_Psst! If you're in our beta and want to peek at this page ahead of time, check the working draft on the pad._ - +### Principles + +- We want to model our expected social norms at every level of leadership in the project. + - We want to avoid creating unnecessary social hierarchy and avoid unaccountable positions in the project. + - These expectations apply to everyone in the project including the core team and the interim community team. +- The Lix community is significantly comprised of people of various marginalised backgrounds. We are committed to protecting these people and providing a safe environment for them. + - If you are of a less-marginalised background, keep in mind that you are a guest in our spaces and although you are welcome, you are nonetheless a guest. +- We want to build leadership in community members and help them grow. +- Technology is neither neutral nor apolitical. We consider how decisions affect different groups of people, and how they may create power dynamics or other consequences. +- Impact is more important than intent. +- The Lix project exists in an ecosystem of related projects and does not gain from antagonism towards other projects. +- We want to create a space that has effective communication. We want to choose to talk through our problems. + - We want to foster collaborative discussion in place of competitive debate: we strongly encourage trying to see from others' viewpoint and working collaboratively to reach a common understanding. +- We want to treat everyone with humanity and understanding: everyone can have bad days, and sometimes the best thing is to take a break from the computer. + +### Hard lines + +The following are hard lines for which we will likely ban on sight. These are not intended as an encompassing set of things that will not be tolerated, but rather as things that we promise will not be in our community. This can extend to patterns of behaviour outside our spaces. + +For the avoidance of doubt, we do not tolerate discrimination such as racism, sexism, transmisia, pluralphobia, ableism or other sorts of discrimination; we do not tolerate unwelcome sexual advances, stalking, harassment or doxing. + +We do not tolerate peddling right-wing ideology, including but not limited to fascism, denying discrimination exists, and other such things. + +We do not tolerate concern trolling, sealioning, and starting bad faith arguments. + +Spamming and crypto scams will not be tolerated. + +Causing legal problems for the project will not be tolerated. + +### Contacts + +We encourage working through conflicts privately with involved parties, but we are here to help if that is not possible. + +If you wish to contact a member of the interim community team about a concern, consider contacting one of the following people: + +- ktemkin (@ktemkin:katesiria.org) +- jade (@jade_:matrix.org) +- qyriad (@qyriad:katesiria.org) +- hexchen (@hexchen:colon.at) +- lunaphied (@lunaphied:lunaphied.me) \ No newline at end of file diff --git a/content/resources.md b/content/resources.md index d3f134ab..6da89890 100644 --- a/content/resources.md +++ b/content/resources.md @@ -28,7 +28,7 @@ once available. ## Understanding Flakes - [Flakes aren't real and can't hurt you](https://jade.fyi/blog/flakes-arent-real/), by our own **jade**. -- Several of Lix community member [Xe Laso]()'s blog posts: +- Several of Lix community member [Xe Iaso]()'s blog posts: - [Nix Flakes: An Introduction](https://xeiaso.net/blog/nix-flakes-1-2022-02-21/) - [Nix Flakes: Exposing and using NixOS Modules](https://xeiaso.net/blog/nix-flakes-1-2022-02-21/) - [Nix Flakes: Packages and How To Use Them](https://xeiaso.net/blog/nix-flakes-2-2022-02-27/) diff --git a/content/team.md b/content/team.md index 0e833a89..0c7a1264 100644 --- a/content/team.md +++ b/content/team.md @@ -92,7 +92,7 @@ conflicts of interest. 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. **Should any decision arise in which TMLLC's interests are - relevant,Qyriad will recuse herself from the relevant decision-making**. + relevant, Kate will recuse herself from the relevant decision-making**. - **Lily** is currently on leave, and will not participate in governance decisions until she returns. diff --git a/data/home/ecosystem.yaml b/data/home/ecosystem.yaml index d4cc195a..3c458121 100644 --- a/data/home/ecosystem.yaml +++ b/data/home/ecosystem.yaml @@ -21,7 +21,7 @@ content: label: "visit nixpkgs" url: "https://github.com/nixos/nixpkgs" - - image: "images/ecosystem-nixpkgs.svg" + - image: "images/ecosystem-nixos.svg" alt: "image of the lix logo on a monitor" title: "Lix-Managed Systems" text: "Lix can also be used as the core Nix implementation for Nix-based systems, including the full NixOS distribution, as well as system management software like Home Manager or nix-darwin." diff --git a/data/home/points.yaml b/data/home/points.yaml index 93d51ea9..19b8707e 100644 --- a/data/home/points.yaml +++ b/data/home/points.yaml @@ -3,7 +3,8 @@ id: "portfolio" content: - - image: "images/services-web-development.png" + - image: "images/points-evolution.svg" + width: "70%" alt: "replace me 1" pretitle: "nix with a modern flavor" title: "an ever-evolving lix codebase, for a language that can evolve" @@ -14,8 +15,9 @@ content: # url: "/roadmap" - - image: "images/services-web-development.png" - alt: "replace me 2" + - image: "images/points-selfhosted.svg" + width: "70%" + alt: "an image of a laptop computer exchanging data with a lix-colored cloud" 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." @@ -24,8 +26,9 @@ content: # - label: "read about our infrastructure" # url: "#" - - image: "images/services-web-development.png" - alt: "replace me 3" + - image: "images/points-configuration.svg" + width: "70%" + alt: "an image of a laptop computer exchanging data with a lix-colored cloud" 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." diff --git a/themes/lix/assets/images/ecosystem-nixos.svg b/themes/lix/assets/images/ecosystem-nixos.svg new file mode 100644 index 00000000..b41ced76 --- /dev/null +++ b/themes/lix/assets/images/ecosystem-nixos.svg @@ -0,0 +1,249 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/themes/lix/assets/images/points-configuration.svg b/themes/lix/assets/images/points-configuration.svg new file mode 100644 index 00000000..ad3c19f2 --- /dev/null +++ b/themes/lix/assets/images/points-configuration.svg @@ -0,0 +1,192 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/themes/lix/assets/images/points-evolution.svg b/themes/lix/assets/images/points-evolution.svg new file mode 100644 index 00000000..817ef018 --- /dev/null +++ b/themes/lix/assets/images/points-evolution.svg @@ -0,0 +1,312 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/themes/lix/assets/images/points-selfhosted.svg b/themes/lix/assets/images/points-selfhosted.svg new file mode 100644 index 00000000..5fc9cb92 --- /dev/null +++ b/themes/lix/assets/images/points-selfhosted.svg @@ -0,0 +1,322 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/themes/lix/layouts/partials/sections/points.html b/themes/lix/layouts/partials/sections/points.html index 83cb20d7..b5ec836e 100644 --- a/themes/lix/layouts/partials/sections/points.html +++ b/themes/lix/layouts/partials/sections/points.html @@ -3,7 +3,7 @@ {{ range .content }}
- {{ partial "utilities/image-fluid.html" (dict "image" .image "alt" .alt) }} + {{ partial "utilities/image-fluid.html" (dict "image" .image "alt" .alt "width" .width) }}
{{ with .pretitle }} diff --git a/themes/lix/layouts/partials/utilities/image-fluid.html b/themes/lix/layouts/partials/utilities/image-fluid.html index 69e7a513..d23eec11 100644 --- a/themes/lix/layouts/partials/utilities/image-fluid.html +++ b/themes/lix/layouts/partials/utilities/image-fluid.html @@ -1,6 +1,6 @@ {{ $img := resources.Get .image }} {{ if eq $img.MediaType.SubType "svg" }} - {{ .alt }} + {{ .alt }} {{ else }} {{ .alt }} {{ end }} \ No newline at end of file