Compare commits

...

25 commits

Author SHA1 Message Date
Dave Anderson 91cc630e23 about: fix typo 2024-06-09 13:08:11 +00:00
Dave Anderson c526b37c6d add-to-config: fix option name for cache servers 2024-06-09 13:08:11 +00:00
Qyriad 9eeba87c32 Merge pull request 'install.md: Fix broken link' (#26) from yayayayaka/lix-website:fix-link-on-install.md into main
Reviewed-on: lix-project/lix-website#26
2024-06-07 20:37:53 +00:00
Yaya 73c79b98f2 install.md: Fix broken link 2024-06-07 20:37:53 +00:00
Qyriad 93047e5a9a Merge pull request 'fix grammar: «a alternative» → «an alternative»' (#25) from das-g/lix-website:fix-grammar-aN-alternative into main
Reviewed-on: lix-project/lix-website#25
2024-06-07 20:37:34 +00:00
Raphael Das Gupta cc3d177e76 fix grammar: «a alternative» → «an alternative»
Use «an» rather than «a» as the indefinite article,
because «alternative» begins with a vowel.
2024-06-07 20:37:34 +00:00
Qyriad b87cc0ff2d Merge pull request 'Fix horizontal scroll on mobile' (#17) from annikahannig/lix-website:main into main
Reviewed-on: lix-project/lix-website#17
2024-06-07 20:37:09 +00:00
Annika Hannig 0b198dcaef fixes horizontal scroll on mobile 2024-06-07 20:37:09 +00:00
Qyriad 4cceedc66d Merge pull request 'theme: explicitly set the width/height of the Matrix icon' (#11) from danderson/lix-website:dave/matrix-logo into main
Reviewed-on: lix-project/lix-website#11
2024-06-07 20:36:28 +00:00
Dave Anderson 6c8c31915d theme: explicitly set the width/height of the Matrix icon
Chrome and Safari default <svg> width and height to 'auto', which
expands the viewport to fit the pixels within. Safari doesn't, and
the viewport collapses to 0x0 unless explicitly expanded.

Firefox calculates the viewport's natural dimensions to be 16x18,
so I used those values.

Fixes #8
2024-06-07 20:36:28 +00:00
Qyriad 8a6aaff86c Merge pull request 'add-to-config: fix typo' (#6) from yu-re-ka/lix-website:main into main
Reviewed-on: lix-project/lix-website#6
2024-06-07 20:35:55 +00:00
Yureka 844d27440c add-to-config: fix typo 2024-06-07 20:35:55 +00:00
Qyriad 8288b491f9
Merge pull request #2 from SebTM/patch-1
add-to-config: Fix inconsistent https-urls for git.lix.systems
2024-05-26 11:12:14 -06:00
Basti 5b03fa1581
add-to-config: Fix inconsistent https-urls for git.lix.systems 2024-05-26 12:56:50 +00:00
Qyriad 0d006b3f80 Merge pull request 'install: fix upgrade-nix command' (#24) from fix-upgrade-nix-command into main
Reviewed-on: lix-project/lix-website#24
Reviewed-by: Qyriad <qyriad@fastmail.com>
2024-05-19 22:07:33 +00:00
puck 3e4f344fe3 install: preserve PATH, as it is needed for Nix upgrades
Some people seem to lack nix in their PATH as root. This should let
them still upgrade to Lix.
2024-05-19 21:50:24 +00:00
puck 7a625db723 install: fix upgrade-nix command
upgrade-nix needs to be passed the replacement substituter too.
2024-05-19 21:35:02 +00:00
jade 185beba13d community standards: remove poor example 2024-05-16 21:08:35 -07:00
Qyriad 7b75e20062 Merge pull request 'community-standards: reword in line with wiki' (#22) from jade/community-standards-wording into main
Reviewed-on: lix-project/lix-website#22
Reviewed-by: Qyriad <qyriad@qyriad.me>
2024-05-15 00:57:47 +00:00
jade 002473b14c community-standards: reword in line with wiki
There was some feedback on Matrix that the sentence about
less-marginalized people being guests in the space was not quite clear
in intent. This should clarify the intent very explicitly.
2024-05-14 17:54:43 -07:00
raito 71290de161 Merge pull request 'faq: Update link to recommended contributions wiki page' (#18) from yayayayaka/lix-website:update-freezes-and-recommended-contributions-url into main
Reviewed-on: lix-project/lix-website#18
2024-05-11 23:02:41 +00:00
Yaya 8c3e0e324d
faq: Update link to recommended contributions wiki page
It was previously pointing to the CppNix version of [`CONTRIBUTING.md`].

[`CONTRIBUTING.md`]: 30dcc19d1f/CONTRIBUTING.md
2024-05-07 09:35:53 +02:00
puck 6708953867 Merge pull request 'Update info for Rebecca' (#13) from rebecca-info into main
Reviewed-on: lix-project/lix-website#13
2024-05-06 16:52:43 +00:00
Rebecca Turner c206ecd0c5
Update info for Rebecca 2024-05-06 09:09:18 -07:00
hexchen 9f9f68809c typo: lix.system in matrix url 2024-05-06 09:31:53 +00:00
9 changed files with 27 additions and 21 deletions

View file

@ -22,7 +22,7 @@ params:
social:
twitter: "https://twitter.com/LixProject"
mastodon: "https://chaos.social/@lix_project"
matrix: "https://matrix.to/#/#space:lix.system"
matrix: "https://matrix.to/#/#space:lix.systems"
github: "https://github.com/lix-project"
git: "https://git.lix.systems/lix-project"

View file

@ -31,7 +31,7 @@ to clusters of critical infrastructure. With this in mind, the Lix team has been
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
Lix is built by a team of open-source volunteers -- and exists to provide an 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.
@ -58,7 +58,7 @@ provide a collection of necessary improvements over CppNix:
- **A language with room to grow.**
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 language and in
tooling.

View file

@ -1,6 +1,6 @@
---
title: "Switching To Lix"
description: "or: how to make your existing configruation Delicious"
description: "or: how to make your existing configuration Delicious"
date: "2024-04-27"
author: "Lix Team"
---
@ -23,7 +23,7 @@ Adding Lix to a flake-based configuration is relatively simple. First, add the L
# 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";
url = "git+https://git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1";
flake = false;
};
lix-module = {
@ -83,7 +83,7 @@ Add the following to any NixOS module in your configuration (e.g. `configuration
```nix
{
nix.settings.extra-substituters = [
nix.settings.substituters = [
"https://cache.lix.systems"
];
@ -152,7 +152,7 @@ Add the following to any NixOS module in your configuration (e.g. `configuration
```nix
{
nix.settings.extra-substituters = [
nix.settings.substituters = [
"https://cache.lix.systems"
];

View file

@ -1,7 +1,7 @@
---
title: "Community Standards"
description: "making Lix a safe and productive environment <3"
date: "2024-04-27"
date: "2024-05-14"
author: "Lix Team"
---
@ -15,7 +15,7 @@ The following are *principles* and do not in any way limit the authority of the
- 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.
- If you are of a less-marginalised background, keep in mind that you are a guest in our spaces but are nonetheless welcome. Think of it like staying at a friend's place where they might have different cultural customs; you may have to do things a little bit differently.
- 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.
@ -48,4 +48,4 @@ If you wish to contact a member of the interim community team about a concern, c
- jade (@jade_:matrix.org)
- qyriad (@qyriad:katesiria.org)
- hexchen (@hexchen:colon.at)
- lunaphied (@lunaphied:lunaphied.me)
- lunaphied (@lunaphied:lunaphied.me)

View file

@ -55,7 +55,7 @@ compiling lists of resources, web design, bug tracker triage, and more. If you'r
to get started on, we have triaged some tasks
[that we believe should be straightforward](https://git.lix.systems/lix-project/lix/issues?q=&type=all&sort=&state=open&labels=157&milestone=0&project=0&assignee=0&poster=0). To read more
about which tasks we recommend taking on, see
[Freezes and recommended contributions](https://git.lix.systems/lix-project/lix/src/branch/main/CONTRIBUTING.md).
[Freezes and recommended contributions](https://wiki.lix.systems/link/9).
Feel free to ask for help in the Lix development channel. Especially feel free to ask for us to write down
more work that we would like help with, or to write contribution information that is missing;

View file

@ -69,12 +69,12 @@ 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 \
sudo --preserve-env=PATH 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
--extra-substituters https://cache.lix.systems --extra-trusted-public-keys "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" \
'git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1' -- \
upgrade-nix \
--extra-substituters https://cache.lix.systems --extra-trusted-public-keys "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
```
You should now have upgraded to Lix! You can verify this by asking the `nix` command
@ -96,4 +96,4 @@ If you're having difficulty installing Lix, don't panic! Hop on over to our
## 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)!
or to [make a pull request to our website](https://git.lix.systems/lix-project/lix-website/pulls)!

View file

@ -50,7 +50,8 @@ 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.
- **Rebecca Turner ([@9999years](https://github.com/9999years), she/her)**
- **Rebecca Turner ([@9999years](https://github.com/9999years), she/her)**
Rebecca is working on the evaluator and error messages.
<br/>
@ -117,7 +118,12 @@ 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.
- **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.**
- **Rebecca Turner** works for [Mercury](https://mercury.com/), a financial
services startup that [uses
Nix](https://serokell.io/blog/haskell-in-production-mercury) to build
software. **Should a governance decision involving these or any other
financial ties arise, Rebecca will recuse herself from the relevant
decision-making.**
<br />

View file

@ -1,4 +1,4 @@
<svg version="1.1" viewBox="0 0 27.9 32" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<svg version="1.1" viewBox="0 0 27.9 32" width="16px" height="18px" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
<title>Matrix (protocol) logo</title>
<g transform="translate(-.095 .005)" fill="#040404">
<path d="m27.1 31.2v-30.5h-2.19v-0.732h3.04v32h-3.04v-0.732z"/>

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

View file

@ -10,7 +10,7 @@
{{ end }}
</div>
</div>
<div class="row g-5">
<div class="row g-4 g-md-5">
{{ range .content.cards }}
<div class="col-12 col-xl-4">
<div class="card bg-blue-16 border-0 border-radius-34 p-4">