yayayayaka/lix-website
0
0
Fork 0
forked from lix-project/lix-website
Code Pull requests Activity

Compare commits

base: yayayayaka:6708953867cf5273caf0535d49f96a7100ee0cd0
Branches Tags
yayayayaka:main
yayayayaka:fix-link-on-install.md
yayayayaka:em-dash
yayayayaka:trailing-space
yayayayaka:rebecca-info
yayayayaka:install-instructions
lix-project:main
lix-project:jade/update-coi
lix-project:quicklinks
lix-project:jade/2.91-post
lix-project:fix-smart-quotes
lix-project:jade/lix-2.90
lix-project:nixpkgs-variant
lix-project:fix-upgrade-nix-command
lix-project:jade/community-standards-wording
lix-project:em-dash
lix-project:trailing-space
lix-project:rebecca-info
lix-project:install-instructions
..
compare: yayayayaka:fb99b76e09f7db40e386e96a9f61dcc9705d460b
Branches Tags
yayayayaka:fix-link-on-install.md
yayayayaka:main
yayayayaka:em-dash
yayayayaka:trailing-space
yayayayaka:rebecca-info
yayayayaka:install-instructions
lix-project:main
lix-project:jade/update-coi
lix-project:quicklinks
lix-project:jade/2.91-post
lix-project:fix-smart-quotes
lix-project:jade/lix-2.90
lix-project:nixpkgs-variant
lix-project:fix-upgrade-nix-command
lix-project:jade/community-standards-wording
lix-project:em-dash
lix-project:trailing-space
lix-project:rebecca-info
lix-project:install-instructions

9 commits
6708953867 ... fb99b76e09

Author SHA1 Message Date
Yaya fb99b76e09
install.md: Fix broken link 2024-05-25 09:43:13 +02: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
3 changed files with 10 additions and 10 deletions
Show stats Expand all files Collapse all files

6
content/community-standards.md
View file

@ -1,7 +1,7 @@
--- ---
title: "Community Standards" title: "Community Standards"
description: "making Lix a safe and productive environment <3" description: "making Lix a safe and productive environment <3"
date: "2024-04-27" date: "2024-05-14"
author: "Lix Team" 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. - 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. - 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. - 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. - 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. - 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. - 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) - jade (@jade_:matrix.org)
- qyriad (@qyriad:katesiria.org) - qyriad (@qyriad:katesiria.org)
- hexchen (@hexchen:colon.at) - hexchen (@hexchen:colon.at)
- lunaphied (@lunaphied:lunaphied.me) - lunaphied (@lunaphied:lunaphied.me)

2
content/faq.md
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 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 [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 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 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; more work that we would like help with, or to write contribution information that is missing;

12
content/install.md
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: Thanks to Nix, we can actually ask Lix to upgrade your system directly. Run the following command:
```sh ```sh
sudo nix run \ sudo --preserve-env=PATH nix run \
--experimental-features "nix-command flakes" \ --experimental-features "nix-command flakes" \
--extra-substituters https://cache.lix.systems \ --extra-substituters https://cache.lix.systems --extra-trusted-public-keys "cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o=" \
--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.1' -- \
'git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.0' -- \ upgrade-nix \
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 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? ## Feedback?
If you have thoughts on these instructions, feel free to drop by our [community](/community), 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)!