Personal blog of a KDE and FreeBSD developer covering Git workflows, C++ and Python notes, and FreeBSD desktop and laptop setups.
HN commenters cite it for the 'git alligator' merge workflow and for FreeBSD desktop guides on KDE, Wayland and the Framework 13 laptop.
KDE 5 is in progress, you can already try it http://euroquis.nl/bobulate/?p=1609
Closing the lid is a non-issue, see sysctl hw.acpi.lid_switch_state.
A more serious problem is that some Thinkpads just don't wake up https://github.com/FreeBSDDesktop/freebsd-base-graphics/issues/145 :(
This was already mentioned here but what's up with people thinking that ZFS is only for large storage arrays? You don't need anything more than a small SSD to get the benefits of snapshots, compression, and general ZFS reliability (copy on write — no data corruption ever, except for like hardware bugs). Boot Environments is an especially great snapshot-based feature.
Also how is bhyve complex? It's the simplest hypervisor ever.
I think the scenario you've described assumes that the branches have diverged -- that each branch has a commit not on the other. But if you always rebase your branch onto `develop` before merging, your branch definitively has no conflicts. If you then use `--no-ff` to merge, it will create a merge commit anyway.
This article shows what I mean: https://euroquis.nl/blabla/2019/08/09/git-alligator.html . (The only thing missing is the rebase before merge, since the example image shows a case where a merge could have hidden some changes.)
For the best of both worlds, I like the "git alligator" workflow: always perform a merge commit when adding a feature, then use `git log --first-parent` to browse the history without seeing the intermediate commits.
https://euroquis.nl/blabla/2019/08/09/git-alligator.html first parent log isn't mentioned, though.
FreeBSD wiki is a bit notorious for being out-of-date, and that particular page is marked “CategoryStale”. Anyway, first result on DuckDuckGo is someone using Wayland on FreeBSD successfully [1].
[1]: https://euroquis.nl/freebsd/2021/03/16/wayland.html
If anyone's interested, there's a slightly more recent update on this work at the link below, dated about a week after this post (23 March vs. 16 March 2025 on the main link).
[1] https://euroquis.nl/freebsd/2025/03/23/framework.html