lenovo/thinkpad/x13s: add options and use other options#1751
Open
BrainWart wants to merge 16 commits into
Open
lenovo/thinkpad/x13s: add options and use other options#1751BrainWart wants to merge 16 commits into
BrainWart wants to merge 16 commits into
Conversation
BrainWart
changed the title
Mic92
reviewed
Mar 31, 2026
Mic92
approved these changes
Mar 31, 2026
Mic92
reviewed
Mar 31, 2026
| path = "${pkgs.modemmanager}/share/ModemManager/fcc-unlock.available.d/105b"; | ||
| } | ||
| ]; | ||
| if [ "$BLUETOOTH_MAC" = "" ] ; then |
Member
There was a problem hiding this comment.
I would use lib.optionalString here.
Author
There was a problem hiding this comment.
I've attempted to use lib.optionalString. If the changes in 2b6ba0e are not quite what you're looking for, please let me know. I appreciate your time. Thank you.
toastal
reviewed
Jun 24, 2026
toastal
reviewed
Jun 24, 2026
toastal
reviewed
Jun 24, 2026
toastal
reviewed
Jun 24, 2026
toastal
reviewed
Jun 24, 2026
toastal
reviewed
Jun 24, 2026
toastal
reviewed
Jun 24, 2026
toastal
reviewed
Jun 24, 2026
toastal
reviewed
Jun 24, 2026
toastal
reviewed
Jun 24, 2026
toastal
reviewed
Jun 24, 2026
Module appears to have come from either https://codeberg.org/adamcstephens/nixos-x13s.git or https://github.com/BrainWart/x13s-nixos/tree/main. Tagging authors from the module history. Co-Authored-By: Adam Stephens <adam@valkor.net> Co-Authored-By: Beaver <beavernotacat@gmail.com> Co-Authored-By: Daniel Barter <danielbarter@gmail.com> Co-Authored-By: Stefan Junker <mail@stefanjunker.de> Co-Authored-By: steveej <steveej@noreply.codeberg.org> Co-Authored-By: TheNightmanCodeth <joseph.diragi@icloud.com>
change uses the deviceTree features in nixpkgs. one could use specialisation to select the el2 device tree for this system now.
grub install would not take the entire package so we are now generating the entire list of included dtbs as extra files.
Author
|
@toastal, I've made the changes you've requested. |
toastal
approved these changes
Jun 25, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
Use options for x13s specific information. Change the way the device tree is selected as well. The built-in NixOS options better handle this now.
systemd-bootneeds no additional configuration when usinghardware.deviceTree. There's now a rough, commented out, implementation for booting using Grub. The system bluetooth device will now get a MAC address automatically generated based on/etc/machine-id.I've attempted to break the changes up in 4 commits splitting up the different changes in easier to review chunks. Drafting the PR now to get feedback and any feedback is appreciated.
Booting the configs
Things done
nixos-hardwareand importing it via<nixos-hardware>or Flake input