WIP: feat!: switch from home-manager to hjem #5

Draft

c wants to merge 3 commits from hjem into master

pull from: hjem

merge into: c:master

c:master

c:restructure-flake

c:openldap-fix

Conversation 0 Commits 3 Files changed 6 +55 -39

c commented 2026-05-11 17:37:40 +03:00

Owner

Copy link

No description provided.

c added 2 commits 2026-05-11 17:37:40 +03:00

adfdsf cbf73f5412

asdf 4998c61867

c force-pushed hjem from 4998c61867 to eaba676a60 2026-05-11 18:02:36 +03:00 Compare

c force-pushed hjem from eaba676a60 to 037c1946fd 2026-05-11 18:06:43 +03:00 Compare

c added 1 commit 2026-05-11 18:10:08 +03:00

hosts/inspiron: disable lion's discord 73ef189f69

c force-pushed hjem from 73ef189f69 to 701040e98f 2026-05-11 18:10:41 +03:00 Compare

c force-pushed hjem from 701040e98f to ee5e043899 2026-05-11 18:14:56 +03:00 Compare

c force-pushed hjem from ee5e043899 to da11e9de8d 2026-05-11 18:17:37 +03:00 Compare

c added 1 commit 2026-05-11 18:19:56 +03:00

hosts: add sysadmin as an alias of orangc to users 425a390efb

c force-pushed hjem from 425a390efb to 4d7fe53e2b 2026-05-11 18:20:18 +03:00 Compare

c force-pushed hjem from 4d7fe53e2b to c421487bc9 2026-05-11 19:36:35 +03:00 Compare

c force-pushed hjem from c421487bc9 to 3e06abca59 2026-05-11 20:46:53 +03:00 Compare

c force-pushed hjem from 3e06abca59 to a47adce949 2026-05-11 20:56:32 +03:00 Compare

c force-pushed hjem from a47adce949 to e5bd929bd5 2026-05-11 21:41:05 +03:00 Compare

c force-pushed hjem from e5bd929bd5 to 7cd107fd81 2026-05-12 09:22:20 +03:00 Compare

c force-pushed hjem from 7cd107fd81 to e82f80bcc4 2026-05-12 10:02:59 +03:00 Compare

c force-pushed hjem from e82f80bcc4 to 2768bcab8a 2026-05-12 10:17:16 +03:00 Compare

c force-pushed hjem from 2768bcab8a to 9ad06e3fd7 2026-05-12 10:18:18 +03:00 Compare

c force-pushed hjem from 9ad06e3fd7 to 599aec01e5 2026-05-12 10:23:58 +03:00 Compare

c force-pushed hjem from 599aec01e5 to 613efee6bd 2026-05-12 10:24:59 +03:00 Compare

c force-pushed hjem from 613efee6bd to 6435532019 2026-05-12 10:44:06 +03:00 Compare

c force-pushed hjem from 6435532019 to 4d1641d8f5 2026-05-12 12:54:19 +03:00 Compare

c force-pushed hjem from 4d1641d8f5 to 9848516255 2026-05-12 12:55:53 +03:00 Compare

c force-pushed hjem from 9848516255 to b1242eb409 2026-05-12 13:15:50 +03:00 Compare

c force-pushed hjem from b1242eb409 to 922703904f 2026-05-12 15:32:42 +03:00 Compare

c changed title from feat!: switch from home-manager to hjem to WIP: feat!: switch from home-manager to hjem 2026-06-07 17:07:54 +03:00

This pull request has changes conflicting with the target branch.

• flake.lock
• hosts/gensokyo/config.nix
• modules/common/default.nix
• modules/hardware/hjem.nix

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Copy merge commit message

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin hjem:hjem

git switch hjem

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 master

git merge --no-ff hjem

git switch hjem

git rebase master

git switch master

git merge --ff-only hjem

git switch hjem

git rebase master

git switch master

git merge --no-ff hjem

git switch master

git merge --squash hjem

git switch master

git merge --ff-only hjem

git switch master

git merge hjem

git push origin master

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

bug

Something isn't working

  

duplicate

This issue or pull request already exists

  

feature request

New feature or request

  

invalid

This doesn't seem right

  

question

Further information is requested

  

wontfix

This will not be worked on

No labels

bug

duplicate

feature request

invalid

question

wontfix

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

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

c/dots!5

No description provided.