FunctionalHacker/dotfiles
FunctionalHacker/dotfiles
2
0
Fork 0
Code Issues 1 Pull requests 1 Releases Activity

WIP: Switch to NixOS #5

Draft
FunctionalHacker wants to merge 1349 commits from nix into main
pull from: nix
merge into: FunctionalHacker:main
Conversation 0 Commits 1349 Files changed 333 +3736 -36108
FunctionalHacker commented 2024-09-19 02:34:51 -05:00
Owner
Copy link
No description provided.
FunctionalHacker added 26 commits 2024-09-19 02:34:52 -05:00 
It allows for a smoother transition to plymouth
FunctionalHacker added 1 commit 2024-09-19 02:37:27 -05:00
FunctionalHacker added 1 commit 2024-09-19 02:39:30 -05:00
FunctionalHacker added 2 commits 2024-09-19 12:43:10 -05:00
FunctionalHacker added 1 commit 2024-09-19 14:57:16 -05:00
FunctionalHacker added 1 commit 2024-09-19 15:02:49 -05:00
FunctionalHacker added 1 commit 2024-09-21 05:51:50 -05:00
FunctionalHacker added 1 commit 2024-09-21 06:10:41 -05:00
FunctionalHacker added 1 commit 2024-09-21 06:20:11 -05:00
FunctionalHacker added 1 commit 2024-09-21 06:36:10 -05:00
FunctionalHacker added 1 commit 2024-09-21 06:45:15 -05:00
FunctionalHacker added 1 commit 2024-09-21 07:02:07 -05:00
FunctionalHacker added 1 commit 2024-09-21 07:13:38 -05:00
FunctionalHacker added 1 commit 2024-09-21 07:41:14 -05:00
FunctionalHacker added 1 commit 2024-09-21 08:00:09 -05:00
FunctionalHacker added 2 commits 2024-09-28 11:32:43 -05:00
FunctionalHacker added 2 commits 2024-09-28 11:45:13 -05:00
FunctionalHacker added 1 commit 2024-09-28 12:05:12 -05:00
FunctionalHacker added 1 commit 2024-09-28 12:37:20 -05:00
FunctionalHacker added 1 commit 2024-09-28 12:50:45 -05:00
FunctionalHacker added 1 commit 2024-09-28 12:53:45 -05:00
FunctionalHacker added 1 commit 2024-09-28 12:59:30 -05:00
FunctionalHacker added 5 commits 2024-10-05 05:55:11 -05:00
FunctionalHacker added 1 commit 2024-10-05 05:57:42 -05:00
FunctionalHacker added 5 commits 2024-10-05 08:18:16 -05:00 
This reverts commit e4e6e32b71.
FunctionalHacker added 1 commit 2024-10-05 08:19:57 -05:00
FunctionalHacker added 1 commit 2024-10-05 09:06:17 -05:00
FunctionalHacker added 2 commits 2024-10-05 09:19:37 -05:00
FunctionalHacker added 1 commit 2024-10-05 09:29:12 -05:00
FunctionalHacker added 1 commit 2024-10-26 13:22:16 -05:00
FunctionalHacker added 1 commit 2024-10-26 13:49:51 -05:00
FunctionalHacker added 2 commits 2024-11-07 14:13:01 -06:00
This pull request has changes conflicting with the target branch.
  • README.adoc
  • docker/.gitignore
  • docker/caddy/Caddyfile
  • docker/forgejo/runner.yaml
  • docker/jellyfin/docker-compose.yaml
  • home/.config/alacritty/alacritty.yml
  • home/.config/beets/config.yaml
  • home/.config/fontconfig/fonts.conf
  • home/.config/gtk-3.0/gtk.css
  • home/.config/mako/config
View command line instructions

Checkout

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

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 checkout main
git merge --no-ff nix
git checkout nix
git rebase main
git checkout main
git merge --ff-only nix
git checkout nix
git rebase main
git checkout main
git merge --no-ff nix
git checkout main
git merge --squash nix
git checkout main
git merge --ff-only nix
git checkout main
git merge nix
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
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: FunctionalHacker/dotfiles#5
No description provided.
Delete branch "nix"

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?