lix-project/lix-website
4
1
Fork 19
Code Issues 5 Pull requests 2 Projects Releases Packages Wiki Activity

Remove "Resources" page #57

Open
piegames wants to merge 2 commits from piegames into main
pull from: piegames
merge into: lix-project:main
Conversation 3 Commits 2 Files changed 8 +11 -77
piegames commented 2025-08-03 18:38:13 +00:00
Member
Copy link
No description provided. 
For those people who don't have `nix-command` enabled by default
It now lives in
https://wiki.lix.systems/books/lix-users/page/nix-resources instead
piegames commented 2025-08-03 18:40:46 +00:00
Author
Member
Copy link

One day, I'll learn to remember to update my main branch first before doing new things

One day, I'll learn to remember to update my main branch first before doing new things
raito commented 2025-08-25 22:29:53 +00:00
Owner
Copy link

There's no motivation in this PR, it'd be great

There's no motivation in this PR, it'd be great
piegames commented 2025-08-26 07:25:39 +00:00
Author
Member
Copy link

Woops. As discussed a while back with @jade, see https://wiki.lix.systems/books/lix-contributors/page/2025-06-27-wiki-work. Main motivation is that the page seems to be better suited to be a wiki page (to lower the barrier of entry to make improvements and link to new resources), side motivation is to try to be more coherent about which content belongs in the wiki and which content belongs on the home page

Woops. As discussed a while back with @jade, see https://wiki.lix.systems/books/lix-contributors/page/2025-06-27-wiki-work. Main motivation is that the page seems to be better suited to be a wiki page (to lower the barrier of entry to make improvements and link to new resources), side motivation is to try to be more coherent about which content belongs in the wiki and which content belongs on the home page
This pull request has changes conflicting with the target branch.
  • content/add-to-config.md
  • content/add-to-config.md.in
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin piegames:piegames
git switch piegames

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main
git merge --no-ff piegames
git switch piegames
git rebase main
git switch main
git merge --ff-only piegames
git switch piegames
git rebase main
git switch main
git merge --no-ff piegames
git switch main
git merge --squash piegames
git switch main
git merge --ff-only piegames
git switch main
git merge piegames
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: lix-project/lix-website#57
No description provided.
Delete branch "piegames"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?