Skip to content

Commit bfdb352

Browse files
author
piegames
committed
Merge pull request 'Use em dashes when appropriate' (#15) from em-dash into main
Reviewed-on: https://git.lix.systems/lix-project/lix-website/pulls/15 Reviewed-by: raito <[email protected]>
2 parents 3f4d774 + fed01ba commit bfdb352

File tree

9 files changed

+29
-29
lines changed

9 files changed

+29
-29
lines changed

content/about.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ can easily configure a system into a known state -- and the packages that are cr
1515
way are guaranteed to run _exactly the same way_ on any system of the same architecture.
1616

1717
As a fork of CppNix (last shared release: 2.18), Lix is designed to be fully compatible with the original CppNix
18-
implementation -- but also designed to allow evolution of the language and tooling, so
18+
implementation --- but also designed to allow evolution of the language and tooling, so
1919
its developers can improve usability and ergonomics without sacrificing correctness.
2020

2121
### Why use Nix?
@@ -56,7 +56,7 @@ provide a collection of necessary improvements over CppNix:
5656
- **A language with room to grow.** <br>
5757
Unlike upstream Nix, Lix intends to be an evolving language -- a robust language versioning
5858
system will allow the language to grow and evolve without sacrificing backwards-compatibility or correctness.
59-
And room to grow means room for **usability and ergonomics improvements** -- both in the language and in
59+
And room to grow means room for **usability and ergonomics improvements** --- both in the language and in
6060
tooling.
6161

6262
- **Clear stability guarantees.** <br>

content/add-to-config.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ great time to check out some of the [community's resources on Nix](/resources).
239239
## Having Trouble?
240240

241241
**One quick thing to check:** have you set `nix.package` anywhere in your configuration?
242-
If so, your configuration option will override the Lix module. You'll want to remove it, first --
242+
If so, your configuration option will override the Lix module. You'll want to remove it, first ---
243243
or, if you're feeling savvy, point it to the provided Lix package.
244244

245245
**Otherwise:** If you're having difficulty installing Lix, don't panic! Hop on over to our

content/add-to-config.md.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ great time to check out some of the [community's resources on Nix](/resources).
239239
## Having Trouble?
240240

241241
**One quick thing to check:** have you set `nix.package` anywhere in your configuration?
242-
If so, your configuration option will override the Lix module. You'll want to remove it, first --
242+
If so, your configuration option will override the Lix module. You'll want to remove it, first ---
243243
or, if you're feeling savvy, point it to the provided Lix package.
244244

245245
**Otherwise:** If you're having difficulty installing Lix, don't panic! Hop on over to our

content/community.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ date: "2024-04-27"
55
author: "Lix Team"
66
---
77

8-
Lix exists **first and foremost for its community** -- and we very much hope that will include you!
9-
If you're looking for help, have any questions, want to pitch in -- or just want to talk -- join us
8+
Lix exists **first and foremost for its community** --- and we very much hope that will include you!
9+
If you're looking for help, have any questions, want to pitch in --- or just want to talk --- join us
1010
using [one of the venues below](#engaging-with-the-community) .
1111

1212
## Community Standards
@@ -24,7 +24,7 @@ nor a small foundation board that governs the community. Instead, **we rely on t
2424
and users to carry the burdens of maintenance and governance**.
2525

2626
We're currently in the process of establishing a more full-fledged governance model, which we believe must
27-
be built on engagement with -- and feedback from -- our community. In the interim, decisions are made by
27+
be built on engagement with --- and feedback from --- our community. In the interim, decisions are made by
2828
simple voting, with one vote held by each member of the "[core team](/team)", who are acting as interim
2929
governance.
3030

@@ -35,14 +35,14 @@ chat platform commonly used among open-source projects.
3535

3636
### Lix Matrix
3737

38-
Joining is relatively straightforward -- you can find us on the `lix.systems` Matrix server.
38+
Joining is relatively straightforward --- you can find us on the `lix.systems` Matrix server.
3939
The easiest way to connect with us is to join our [Matrix space](https://matrix.to/#/#space:lix.systems),
4040
which will allow you to see previews of and join the most relevant community rooms.
4141

42-
Note that all community venues -- including our Matrix rooms -- are subject to our [community standards](/community-standards).
42+
Note that all community venues --- including our Matrix rooms --- are subject to our [community standards](/community-standards).
4343

4444
### Community Resources
4545

4646
In order to help folks who are getting started or who want to learn more about Lix, we've created a curated
4747
list of [community resources](/resources) that you may find helpful. If you have suggestions, feel free to
48-
drop them in our Matrix chat!
48+
drop them in our Matrix chat!

content/faq.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ date: "2024-05-01"
55
author: "Lix Team"
66
---
77

8-
These are the most common questions we get -- or anticipate getting. If you can't find the answer
8+
These are the most common questions we get --- or anticipate getting. If you can't find the answer
99
you're looking for, please feel free to ask over in the [community](/community).
1010

1111
<br/>
@@ -20,12 +20,12 @@ Check out the [install page](/install) to see how to use Lix with your existing
2020
#### Q: What are your plans for flakes?
2121

2222
One of our primary goals is compatibility. While flakes are an experimental technology, their use is
23-
widespread enough that they've become a de-facto part of the Nix ecosystem -- and thus we consider them
23+
widespread enough that they've become a de-facto part of the Nix ecosystem --- and thus we consider them
2424
to be part of our compatibility guarantee.
2525

2626
That said, we're not tied to any particular flake implementation. As Lix develops, we plan on adding an
27-
extension system for the tooling -- which will allow technologies like flakes, as well as new and different
28-
extensions -- to seamlessly act with the Lix core without needing to reside long-term in the Lix tree.
27+
extension system for the tooling --- which will allow technologies like flakes, as well as new and different
28+
extensions --- to seamlessly act with the Lix core without needing to reside long-term in the Lix tree.
2929

3030
_Flakes are not the only way to write Nix language code in Lix, and we intend to provide a good experience
3131
to those using flakes -- while also improving the experience for those not using them --
@@ -35,16 +35,16 @@ by evolving a compatible but more flexible flake-like abstraction in the periphe
3535
#### Q: What relation does Lix have to the Nix Foundation, and to related projects?
3636

3737
Besides being a fork of CppNix and an implementation of the Nix language, Lix is the
38-
effort of a number of long-time Nix, Nixpkgs, NixOS, and Snix contributors and maintainers -- and has
38+
effort of a number of long-time Nix, Nixpkgs, NixOS, and Snix contributors and maintainers --- and has
3939
been developed in partnership with a number of prolific Nix-documenters, bloggers, and users.
4040

41-
We welcome anyone who wants to develop for both Lix and another implementation -- including CppNix and Snix,
41+
We welcome anyone who wants to develop for both Lix and another implementation --- including CppNix and Snix,
4242
and our open-source implementation absolutely allows any developer to integrate our code into any
4343
license-compatible project.
4444

4545
However, ___Lix does not fall under the NixOS Foundation umbrella___, is funded independently of the foundation,
4646
and is not in any way controlled by its leadership. With the recent reboot of the foundation's governance,
47-
we are in communication with -- and open to collaboration with -- the foundation.
47+
we are in communication with --- and open to collaboration with --- the foundation.
4848

4949
#### Q: How does Lix work? How can I contribute or help out?
5050

@@ -88,17 +88,17 @@ will gladly make you one manually.
8888
#### Q: If Lix plans to adopt Rust, what makes it different from Snix?
8989

9090
Unlike Lix, [Snix](https://snix.dev/) is a ground-up re-implementation of the Nix language in Rust,
91-
which shares many of the same modernization goals as Lix -- but also has a long way to go before it can
91+
which shares many of the same modernization goals as Lix --- but also has a long way to go before it can
9292
reach feature parity (and parity in correctness) with the CppNix and Lix implementations.
9393

94-
Lix instead plans a _top-down_, _piecewise_ approach to our Rust extensions and replacements -- which means
95-
that Lix already has feature-parity with -- and correctness exceeding -- the original CppNix.
94+
Lix instead plans a _top-down_, _piecewise_ approach to our Rust extensions and replacements --- which means
95+
that Lix already has feature-parity with --- and correctness exceeding --- the original CppNix.
9696

9797

9898
#### Q: What does the name Lix stand for? How is it pronounced?
9999

100100
Like Nix, Lix isn't really short for anything. The name originally derives from the term _Layered Nix_,
101101
based on the premise of layering new language and tooling features atop a fully-compatible, rock-solid base.
102102

103-
Lix is pronounced like _licks_ -- i.e. what you might do if someone handed you a delicious ice cream cone;
103+
Lix is pronounced like _licks_ --- i.e. what you might do if someone handed you a delicious ice cream cone;
104104
which may or may not be stacked up with lambdas.

content/install.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Whether you're a new or returning user, **we're thrilled you've decided to pick
1717

1818
Lix works out-of-the-box on most Linux and MacOS systems, including with system management tools
1919
such as [home-manager](https://github.com/nix-community/home-manager) and
20-
[nix-darwin](https://github.com/LnL7/nix-darwin) -- but, like any Nix-based system, some Nix background
20+
[nix-darwin](https://github.com/LnL7/nix-darwin) --- but, like any Nix-based system, some Nix background
2121
knowledge is recommended before installation.
2222

2323
If you're new to the Nix ecosystem, you may want to check out some [community resources](/resources)
@@ -61,7 +61,7 @@ Open a terminal, and run the following command:
6161
curl -sSf -L https://install.lix.systems/lix | sh -s -- install
6262
```
6363

64-
The installer will guide you through installing Lix -- and once it's finished,
64+
The installer will guide you through installing Lix --- and once it's finished,
6565
you'll have a full, working installation. If you're not sure what to do, now is a
6666
great time to check out some of the [community's resources on Nix](/resources).
6767

content/install.md.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Whether you're a new or returning user, **we're thrilled you've decided to pick
1717

1818
Lix works out-of-the-box on most Linux and MacOS systems, including with system management tools
1919
such as [home-manager](https://github.com/nix-community/home-manager) and
20-
[nix-darwin](https://github.com/LnL7/nix-darwin) -- but, like any Nix-based system, some Nix background
20+
[nix-darwin](https://github.com/LnL7/nix-darwin) --- but, like any Nix-based system, some Nix background
2121
knowledge is recommended before installation.
2222

2323
If you're new to the Nix ecosystem, you may want to check out some [community resources](/resources)
@@ -61,7 +61,7 @@ Open a terminal, and run the following command:
6161
curl -sSf -L https://install.lix.systems/lix | sh -s -- install
6262
```
6363

64-
The installer will guide you through installing Lix -- and once it's finished,
64+
The installer will guide you through installing Lix --- and once it's finished,
6565
you'll have a full, working installation. If you're not sure what to do, now is a
6666
great time to check out some of the [community's resources on Nix](/resources).
6767

content/resources.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ date: "2024-04-27"
55
author: "Lix Team"
66
---
77

8-
Lix doesn't exist in a vacuum -- but instead builds atop the incredible work of dozens of
8+
Lix doesn't exist in a vacuum --- but instead builds atop the incredible work of dozens of
99
NixOS community members. This page collects resources that have been recommended by members
1010
of the community.
1111

content/team.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ and users to carry the burdens of maintenance and governance.
1313

1414
The **core team** are the developers most directly responsible for the Lix project. While the project
1515
is in its "soft-release" period, these folks are responsible for project governance. One of their main
16-
tasks is to establish a lasting governance model -- and other teams to handle things!
16+
tasks is to establish a lasting governance model --- and other teams to handle things!
1717

1818
Members (in alphabetical order):
1919

@@ -54,12 +54,12 @@ Members (in alphabetical order):
5454
<br/>
5555

5656
We all hang around in [community spaces](/community), including on Matrix. Feel free to pop into
57-
the Lix channels and say hello -- we'd love to hear what you think of Lix!
57+
the Lix channels and say hello --- we'd love to hear what you think of Lix!
5858

5959
## Conflict of Interest Statements
6060

6161
As a community project, it's important that project decisions are made **exclusively for the
62-
benefit of the community**, and don't serve any other interests -- including personal or corporate gain.
62+
benefit of the community**, and don't serve any other interests --- including personal or corporate gain.
6363

6464
If a team member is unable to do so in any context, they are **required** to disclose the _conflict of interest_
6565
and to recuse themselves from any leadership decisions affected.

0 commit comments

Comments
 (0)