Skip to content

Conversation

@NikSneMC
Copy link
Contributor

@NikSneMC NikSneMC commented Jan 2, 2026

It works fine but needs all dms-generated config files to be present

That hack should be replaced with proper config includes after sodiboo/niri-flake#1548 merge

The only problem is that optional includes aren't released yet.

@LuckShiba LuckShiba self-assigned this Jan 2, 2026
Copy link
Collaborator

@LuckShiba LuckShiba left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for this, this will be very good for users that use niri-flake while we don't get includes in the upstream! A few comments though.

@NikSneMC NikSneMC force-pushed the fix/niri-flake-imports branch from 24fa8a6 to 2c146fe Compare January 2, 2026 16:21
@NikSneMC NikSneMC requested a review from LuckShiba January 2, 2026 16:23
@NikSneMC NikSneMC force-pushed the fix/niri-flake-imports branch 6 times, most recently from 23901bb to 022b89e Compare January 2, 2026 16:40
@LuckShiba
Copy link
Collaborator

Looks good to me, and is working here :)

@NikSneMC NikSneMC force-pushed the fix/niri-flake-imports branch from 022b89e to 79bb707 Compare January 2, 2026 19:06
@NikSneMC
Copy link
Contributor Author

NikSneMC commented Jan 2, 2026

I've got overrides wrong initially. Fixed

@NikSneMC NikSneMC force-pushed the fix/niri-flake-imports branch 2 times, most recently from ad68a90 to 1c03077 Compare January 2, 2026 19:29
@NikSneMC
Copy link
Contributor Author

NikSneMC commented Jan 2, 2026

Looks like I've completely forgot about the border special case. Working on a fix

UPD. fixed

@NikSneMC NikSneMC force-pushed the fix/niri-flake-imports branch from 1c03077 to 05b9f65 Compare January 2, 2026 19:59
@LuckShiba
Copy link
Collaborator

aLooks like I've completely forgot about border special case. Working on a fix

UPD. fixed

Good catch. Can't we simply add the fixes in the generated config.kdl file rather than in another file? I guess this way may be good if we need more fixes which touches the same parts in the future, but will these cases happen?

@NikSneMC
Copy link
Contributor Author

NikSneMC commented Jan 2, 2026

Can't we simply add the fixes in the generated config.kdl file rather than in another file?

Yes, we can. It's just a matter of preference ¯\_(ツ)_/¯

I guess this way may be good if we need more fixes which touches the same parts in the future, but will these cases happen?

Theoretically, yes. Niri-flake may not add support for new stuff until that rewrite happens, but every new niri version can introduce new changes that may require fixes like this one. But I think my solution is definitely overengineered)

@LuckShiba
Copy link
Collaborator

LuckShiba commented Jan 2, 2026

But I think my solution is definitely overengineered

It surely is, but I guess we can keep it that way for now. I'll wait on @marcusramberg's input on this and we can merge :)

@NikSneMC NikSneMC force-pushed the fix/niri-flake-imports branch from 05b9f65 to a91f5ef Compare January 2, 2026 22:22
@NikSneMC
Copy link
Contributor Author

NikSneMC commented Jan 2, 2026

Can't we simply add the fixes in the generated config.kdl file rather than in another file?

Yes, we can. It's just a matter of preference ¯\_(ツ)_/¯

After a comparison I think that a single config.kdl is cleaner and a little bit easier to work with

@NikSneMC NikSneMC force-pushed the fix/niri-flake-imports branch 4 times, most recently from 4166082 to cf4989e Compare January 2, 2026 22:29
It works fine but needs all dms-generated config files to be present
@NikSneMC NikSneMC force-pushed the fix/niri-flake-imports branch from cf4989e to 936c7b4 Compare January 2, 2026 23:29
@marcusramberg
Copy link
Collaborator

Lgtm :)

@marcusramberg marcusramberg merged commit 7d761c4 into AvengeMedia:master Jan 2, 2026
2 checks passed
@NikSneMC NikSneMC deleted the fix/niri-flake-imports branch January 2, 2026 23:45
@beckend beckend mentioned this pull request Jan 3, 2026
13 tasks
Vortriz added a commit to Vortriz/dotfiles that referenced this pull request Jan 4, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants