Lithium/nixosConfig
2
1
Fork 0
Code Issues 3 Pull requests 2 Projects Packages Wiki Activity Actions

feat(nixflix) #31

Open
Lithium wants to merge 0 commits from feat(nixflix) into main
pull from: feat(nixflix)
merge into: Lithium:main
Conversation 0 Commits - Files changed -
Lithium commented 2026-09-05 14:20:41 +02:00
Owner
Copy link
No description provided. 
This is only getting pushed to test it.
has sonarr-anime, jellyfin, qbittorrent and vpn
oh the misery I can't find my identity
This pull request has changes conflicting with the target branch.
  • flake.lock
  • modules/hosts/rise/configuration.nix
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 feat(nixflix):feat(nixflix)
git switch feat(nixflix)

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 feat(nixflix)
git switch feat(nixflix)
git rebase main
git switch main
git merge --ff-only feat(nixflix)
git switch feat(nixflix)
git rebase main
git switch main
git merge --no-ff feat(nixflix)
git switch main
git merge --squash feat(nixflix)
git switch main
git merge --ff-only feat(nixflix)
git switch main
git merge feat(nixflix)
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Compat/Breaking
Breaking change that won't be backward compatible

  
Kind/Bug
Something is not working

  
Kind/Documentation
Documentation changes

  
Kind/Enhancement
Improve existing functionality

  
Kind/Feature
New functionality

  
Kind/Security
This is security issue

  
Kind/Testing
Issue or pull request related to testing

  
Priority
Critical
 The priority is critical

  
Priority
High
 The priority is high

  
Priority
Low
 The priority is low

  
Priority
Medium
 The priority is medium

  
Reviewed
Confirmed
 Issue has been confirmed

  
Reviewed
Duplicate
 This issue or pull request already exists

  
Reviewed
Invalid
 Invalid issue

  
Reviewed
Won't Fix
 This issue won't be fixed

  
Status
Abandoned
 Somebody has started to work on this but abandoned work

  
Status
Blocked
 Something is blocking this issue or pull request

  
Status
Need More Info
 Feedback is required to reproduce issue or to continue work

No labels
Compat/Breaking
Kind/Bug
Kind/Documentation
Kind/Enhancement
Kind/Feature
Kind/Security
Kind/Testing
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Status
Abandoned
Status
Blocked
Status
Need More Info
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
Lithium/nixosConfig!31
No description provided.