Skip to content

Commit 9d26753

Browse files
authored
Merge branch 'AerynOS:main' into main
2 parents a5900aa + bc1f93a commit 9d26753

8 files changed

Lines changed: 490 additions & 435 deletions

File tree

astro.config.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ export default defineConfig({
146146
{ slug: "packaging/workflow/basic-workflow" },
147147
{ slug: "packaging/workflow/creating-a-new-recipe" },
148148
{ slug: "packaging/workflow/updating-an-existing-recipe" },
149+
{ slug: "packaging/workflow/submitting-a-pr" },
149150
],
150151
},
151152
{

package-lock.json

Lines changed: 406 additions & 425 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"astro": "astro"
1212
},
1313
"dependencies": {
14-
"@astrojs/starlight": "^0.37.1",
15-
"astro": "^5.16.6",
14+
"@astrojs/starlight": "^0.37.2",
15+
"astro": "^5.16.8",
1616
"sharp": "^0.34.5",
1717
"starlight-kbd": "^0.3.0",
1818
"starlight-links-validator": "^0.19.2",

src/content/docs/AerynOS/faq.mdx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: FAQ
3-
lastUpdated: 2025-08-23T20:50:00Z
3+
lastUpdated: 2026-01-15T12:25:00Z
44
description: Frequently asked questions
55
---
66

@@ -58,8 +58,9 @@ In practice, we recommend that you install AerynOS to a separate drive with:
5858
- This must be manually formatted for the installer to recognise it.
5959
- A 4GB XBOOTLDR FAT32 partition (type 142 in fdisk, bls_boot in gparted).
6060
- This must be manually formatted for the installer to recognise it.
61-
- This partition is large, because it is where the AerynOS kernel and (in the future) rescue image files will be saved.
61+
- This partition is large, because it is where the AerynOS kernel+initramfs and (in the future) rescue image files will be saved.
6262
- A >20 GB system xfs partition
63+
- This must be manually formatted for the installer to recognise it.
6364
- The larger the xfs system (/ or root) partition is, the more OS /usr directory rollback states it can support in /.moss/.
6465

6566
```
@@ -202,7 +203,6 @@ Yes! We absolutely love seeing people using AerynOS in the wild!
202203

203204
- Please first share them as a post in the [Show and Tell category](https://github.com/orgs/AerynOS/discussions/categories/show-and-tell),
204205
- Then, share a link to your post in the [AerynOS Zulip space](https://aerynos.zulipchat.com/join/fuqokhsomj5mzqj6akqaiqlr/) in the #Show-and-Tell channel in the General - Public space so the link to the video doesn't get lost in the Zulip chat.
205-
- If you are a content creator, you may want to join the Content Creator Corner room as well.
206206

207207
### Which distribution is AerynOS derived from?
208208

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
---
2+
title: 'Submitting a PR'
3+
lastUpdated: 2026-01-11T21:22:00
4+
---
5+
6+
import { Aside } from "@astrojs/starlight/components";
7+
8+
9+
# Submitting packages to AerynOS repository
10+
11+
Once you have prepared your package, you can submit it to the AerynOS repository by creating a pull request (PR). There are certain guidelines to follow when submitting a PR:
12+
13+
## Naming Pull Requests
14+
15+
To keep git summaries readable, AerynOS requires the following git summary format
16+
17+
- `name: Add at v<version>`
18+
- `name: Update to v<version>`
19+
- `name: Fix <...>`
20+
- `[NFC] name: <description of no functional change commit>`
21+
22+
<Aside type="note" title="No Functional Change">
23+
NFC refers to "No Functional Change", which means that the commit does not introduce any new functionality or behavior, so a recipe does not need to be rebuilt as part of the PR process.
24+
</Aside>
25+
26+
## Content of Pull Request descriptions
27+
28+
Git commits should be self-contained and self-explanatory. They serve as documentation for the changes made to a codebase so that others can understand and review them and also refer back to them later down the line. It is important to provide high quality git commit messages so that you or other contributors can understand the changes you are making and why.
29+
30+
While you know what you're doing in the moment, other contributors may not, and as time goes by, bisecting changes becomes more difficult if commit messages give you no clue as to why you made a change or what regressions might be caused if you alter it.
31+
32+
### Commit message format
33+
34+
The recommendation for commit messages is:
35+
36+
- Short summary written in the imperative mood
37+
- A few sentences or bullet points with the key changes this commit introduces
38+
- Link to full changelog (if applicable). If this commit updates the recipe several versions, consider splitting the changelog out into version bullet point entries in ascending order (newest change last).
39+
- Test plan demonstrating that you have actually confirmed the changes work on your local system
40+
- If the change resolves an issue, include a Resolves line with the issue number (Where `issuenumber` is the issue number of the package request/update).
41+
42+
The last point about the test plan is particularly important, as it ensures that the changes have been tested and verified before being merged into the main codebase. There is an explicit agreement that you take ownership of the quality of the changes/updates you submit, and that you understand that if there are issues, you are likely to be the first person consulted to fix said issues.
43+
44+
<Aside type="note" title="The imperative mood">
45+
Git commits should be written in the [imperative mood](https://medium.com/@luka_78026/imperative-mood-makes-you-feel-good-1cad063d7014). This means that the commit message should start with a verb in the present tense, such as "Add", "Update", or "Fix". This makes the commit message more concise and easier to understand.
46+
</Aside>
47+
48+
#### Example commit message
49+
50+
An example commit message for the AerynOS recipe repository is structured as follows:
51+
52+
```
53+
brobdingnar: Update to v1.2.3
54+
55+
Write a suitable short summary of the changes if relevant, including potentially a list of things like:
56+
- foo
57+
- bar
58+
- baz
59+
60+
Full changelog [here](the.uri)
61+
62+
**Test Plan**:
63+
64+
- Build and install the updated package
65+
- Confirm functionality of changes
66+
67+
**Resolves**:
68+
(If applicable for the recipes repository) Resolves aerynos/recipes#issuenumber
69+
```

src/content/docs/Packaging/Workflow/updating-an-existing-recipe.mdx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,10 @@ sudo moss install "package name"
127127

128128
Once you have tested the package, you can make a submission for including the update in the repository.
129129

130+
<Aside type="tip">
131+
To find guidance on how to submit a pull request (PR), you can refer to our [submit a pull request](/packaging/workflow/submitting-a-pr) page. s
132+
</Aside>
133+
130134
## Checking for updates
131135

132136
To simplify update tracking for package maintainers, AerynOS provides a tool called **Ent**. Ent checks recipes against upstream sources to determine whether updates are available.

src/content/docs/Users/Desktops/gnome.mdx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
---
22
title: 'GNOME'
3-
lastUpdated: 2025-08-23T17:25:00Z
3+
lastUpdated: 2026-01-13T11:10:00+07:00
44
description: "GNOME Desktop"
55
---
66

77
The default desktop environemnt for the AerynOS live environment and for installs using `lichen` is [GNOME](https://www.gnome.org/). We utilise Wayland display server protocol and do not offer X11 (or any fork of X11).
88

9-
GNOME has been chosen as the default environment due to our familiarity with the GNOME software stack and therefore our ability to maintain it whilst we work on fleshing out the AerynOS tooling an infrastructure.
9+
GNOME has been chosen as the default environment due to our familiarity with the GNOME software stack and therefore our ability to maintain it whilst we work on fleshing out the AerynOS tooling and infrastructure.
1010

1111
It is recommended to install GNOME using `lichen`, rather than adding to an existing install.
1212

src/content/docs/Users/Getting Started/downloading.mdx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
title: Downloading AerynOS
3-
lastUpdated: 2024-09-10T23:36:23+08:00
3+
lastUpdated: 2025-01-13T10:49:00+07:00
44
description: Downloading the AerynOS ISO file and verifying the checksums
55
---
66

@@ -12,10 +12,10 @@ import { Aside } from '@astrojs/starlight/components';
1212
2. Look for the latest release available for download, the official ISO files are named `AerynOS-<version>-<desktop>-<architecture>.iso`.
1313

1414
<Aside>
15-
Their may be multiple versions available with different desktop environments donoted by `AerynOS-<version>-<desktop>-<architecture>.iso` where `<desktop>` is the desktop environment.
15+
There may be multiple versions available with different desktop environments denoted by `AerynOS-<version>-<desktop>-<architecture>.iso` where `<desktop>` is the desktop environment.
1616
</Aside>
1717

18-
3. Click on the download link to start downloading the ISO file and assiocated checksums donated by `AerynOS-<version>-<desktop>-<architecture>.iso.sha256sum`.
18+
3. Click on the download link to start downloading the ISO file and assiocated checksums denoted by `AerynOS-<version>-<desktop>-<architecture>.iso.sha256sum`.
1919

2020
Once the download is complete, you can proceed with creating a bootable USB drive or burning the ISO to a DVD to install AerynOS on your machine.
2121

0 commit comments

Comments
 (0)