git-etawen-dev-mia/ps5-linux-image
Watch
1
0
Fork
You've already forked ps5-linux-image
 0
Code Issues Pull requests 2 Releases 1 Activity

WIP: NixOS Image #3

Draft
deftdawg wants to merge 3 commits from deftdawg/nixos into main
pull from: deftdawg/nixos
merge into: git-etawen-dev-mia:main
Conversation 0 Commits 3 Files changed 33 +6658 -117
deftdawg commented 2026-06-27 11:35:01 -05:00 (Migrated from git.etawen.dev)
  • NixOS + Jovian (Steam Deck UI experience)
  • Uptime gating determines Steam UI vs Desktop vs Console (can be overridden at build time or with cmdline.txt ui-mode) -> UI_MODE_NOTICE.md is generated to tell user why they ended up on Desktop or in Console mode
  • USB can self install to m2, no additional image file is required
  • NixOS generation upgrading using USB is experimental WIP
- NixOS + Jovian (Steam Deck UI experience) - Uptime gating determines Steam UI vs Desktop vs Console (can be overridden at build time or with cmdline.txt `ui-mode`) -> UI_MODE_NOTICE.md is generated to tell user why they ended up on Desktop or in Console mode - USB can self install to m2, no additional image file is required - NixOS generation upgrading using USB is experimental WIP
This pull request has changes conflicting with the target branch.
  • .forgejo/workflows/build-image.yml
  • build_image.sh
  • docker/image-builder/Dockerfile
  • docker/image-builder/entrypoint.sh
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

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

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 'deftdawg/nixos'
git switch 'deftdawg/nixos'
git rebase 'main'
git switch 'main'
git merge --ff-only 'deftdawg/nixos'
git switch 'deftdawg/nixos'
git rebase 'main'
git switch 'main'
git merge --no-ff 'deftdawg/nixos'
git switch 'main'
git merge --squash 'deftdawg/nixos'
git switch 'main'
git merge --ff-only 'deftdawg/nixos'
git switch 'main'
git merge 'deftdawg/nixos'
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
Assignees
Clear assignees
No assignees
1 participant
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
git-etawen-dev-mia/ps5-linux-image!3
No description provided.