sscoble/laptop-config
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

T490 + Windows 11 dual-boot: review branch t490-dualboot #1

New issue
Open
opened 2026-06-06 02:54:47 +00:00 by agent-cos · 1 comment
agent-cos commented 2026-06-06 02:54:47 +00:00
Copy link

Summary

This branch adds support for installing NixOS alongside an existing Windows 11 install on the ThinkPad T490 20N3, sharing the existing EFI System Partition (no separate ESP needed).

Changes

  • modules/laptop.nix — Bootloader config now declares an explicit boot.loader.systemd-boot.extraEntries for "Windows Boot Manager", chainloading the standard Microsoft EFI binary at $ESP/EFI/Microsoft/Boot/bootmgfw.efi. Sort key z_windows places it after the NixOS generation entries. configurationLimit raised from default to 50 to keep more generations in the menu. NixOS 26.05 ("Yarara") may also autodetect Windows on a shared ESP, in which case the explicit entry is a harmless duplicate.

  • install.sh (new, executable) — Guided dual-boot installer that can be curl-piped from the NixOS installer ISO:

    curl -L https://os.scoble.me/forgejo/sscoble/laptop-config/raw/branch/main/install.sh | sudo bash

    Auto-detects the T490's internal NVMe (/dev/nvme0n1), finds the existing ESP and Windows NTFS partition, shrinks Windows with ntfsresize (no data loss), creates a NixOS ext4 root partition, mounts the existing ESP at /mnt/boot, and runs nixos-install with this flake. Idempotent except for the partition shrink (which only happens once). Override defaults with env vars: DISK, NIXOS_SIZE, SWAP_SIZE, FLAKE_URL, HOST.

  • MIGRATION.md — New "T490 + Windows 11 dual-boot" section at the top of the doc, with the guided flow, manual fallback for unusual layouts, and NixOS 26.05 compatibility notes (systemd Stage 1 initrd default, boot.supportedFilesystems attrset, systemd.extraConfig removed — none of which affect this config).

Tested

  • nix flake check — boot config evaluates correctly. The extraEntries produces exactly the expected systemd-boot conf content: 
    { "windows.conf" = "title Windows Boot Manager\nefi /EFI/Microsoft/Boot/bootmgfw.efi\nsort-key z_windows\ntype oneshot\n"; }
  • install.sh — Reviewed for shell correctness; partition identification switched from glob expansion to lsblk enumeration (the original ${DISK}p? glob breaks on disks with >9 partitions). ntfsresize call now uses correct --size <bytes> syntax with a unit-aware byte conversion. Not yet run on real hardware — the T490 still has Win11, no NixOS install yet.

NixOS 26.05 "Yarara" notes

The flake pins nixos-unstable, which as of June 2026 tracks 26.05+. Key 26.05 changes verified not to break this config:

  • boot.initrd.systemd.enable is default true → no action needed
  • boot.supportedFilesystems is now attrset, not list → no impact (we don't override it)
  • systemd.extraConfig removed → no impact (we don't use it)
  • New boot.loader.systemd-boot.windows option exists for multi-drive setups → not needed for shared-ESP T490

Decisions that need review

  1. systemd-boot vs GRUB: stayed with systemd-boot (the existing choice) rather than switching to GRUB with os-prober. Pro: minimal change, fewer moving parts, matches the rest of the repo. Con: manual entry instead of auto-detection. Easy to flip later if needed.

  2. The install.sh script's ntfsresize step: requires that Windows has been shut down cleanly (or the user has run chkdsk /f from WinRE). If Windows was force-shut, the script will refuse to shrink. Worth documenting in the README.

  3. Branch name: t490-dualboot. If you want it named differently, rename before merge.

What I can't do from here

  • Open a PR — the forgejo MCP is set up for issue CRUD but not PR CRUD. The push went through directly to the branch. Open a PR via the URL below.
  • Test on real hardware — the T490 currently has Win11. The branch is ready to merge; testing happens on the device.

Links

## Summary This branch adds support for installing NixOS alongside an existing Windows 11 install on the ThinkPad T490 20N3, sharing the existing EFI System Partition (no separate ESP needed). ## Changes - **`modules/laptop.nix`** — Bootloader config now declares an explicit `boot.loader.systemd-boot.extraEntries` for "Windows Boot Manager", chainloading the standard Microsoft EFI binary at `$ESP/EFI/Microsoft/Boot/bootmgfw.efi`. Sort key `z_windows` places it after the NixOS generation entries. `configurationLimit` raised from default to 50 to keep more generations in the menu. NixOS 26.05 ("Yarara") may also autodetect Windows on a shared ESP, in which case the explicit entry is a harmless duplicate. - **`install.sh`** (new, executable) — Guided dual-boot installer that can be curl-piped from the NixOS installer ISO: ``` curl -L https://os.scoble.me/forgejo/sscoble/laptop-config/raw/branch/main/install.sh | sudo bash ``` Auto-detects the T490's internal NVMe (`/dev/nvme0n1`), finds the existing ESP and Windows NTFS partition, shrinks Windows with `ntfsresize` (no data loss), creates a NixOS ext4 root partition, mounts the existing ESP at `/mnt/boot`, and runs `nixos-install` with this flake. Idempotent except for the partition shrink (which only happens once). Override defaults with env vars: `DISK`, `NIXOS_SIZE`, `SWAP_SIZE`, `FLAKE_URL`, `HOST`. - **`MIGRATION.md`** — New "T490 + Windows 11 dual-boot" section at the top of the doc, with the guided flow, manual fallback for unusual layouts, and NixOS 26.05 compatibility notes (systemd Stage 1 initrd default, `boot.supportedFilesystems` attrset, `systemd.extraConfig` removed — none of which affect this config). ## Tested - `nix flake check` — boot config evaluates correctly. The `extraEntries` produces exactly the expected systemd-boot conf content: ``` { "windows.conf" = "title Windows Boot Manager\nefi /EFI/Microsoft/Boot/bootmgfw.efi\nsort-key z_windows\ntype oneshot\n"; } ``` - `install.sh` — Reviewed for shell correctness; partition identification switched from glob expansion to `lsblk` enumeration (the original `${DISK}p?` glob breaks on disks with >9 partitions). `ntfsresize` call now uses correct `--size <bytes>` syntax with a unit-aware byte conversion. **Not yet run on real hardware** — the T490 still has Win11, no NixOS install yet. ## NixOS 26.05 "Yarara" notes The flake pins `nixos-unstable`, which as of June 2026 tracks 26.05+. Key 26.05 changes verified not to break this config: - `boot.initrd.systemd.enable` is default true → no action needed - `boot.supportedFilesystems` is now attrset, not list → no impact (we don't override it) - `systemd.extraConfig` removed → no impact (we don't use it) - New `boot.loader.systemd-boot.windows` option exists for multi-drive setups → not needed for shared-ESP T490 ## Decisions that need review 1. **systemd-boot vs GRUB**: stayed with systemd-boot (the existing choice) rather than switching to GRUB with `os-prober`. Pro: minimal change, fewer moving parts, matches the rest of the repo. Con: manual entry instead of auto-detection. Easy to flip later if needed. 2. **The `install.sh` script's ntfsresize step**: requires that Windows has been shut down cleanly (or the user has run `chkdsk /f` from WinRE). If Windows was force-shut, the script will refuse to shrink. Worth documenting in the README. 3. **Branch name**: `t490-dualboot`. If you want it named differently, rename before merge. ## What I can't do from here - **Open a PR** — the forgejo MCP is set up for issue CRUD but not PR CRUD. The push went through directly to the branch. Open a PR via the URL below. - **Test on real hardware** — the T490 currently has Win11. The branch is ready to merge; testing happens on the device. ## Links - Branch: `t490-dualboot` (pushed) - PR URL: https://os.scoble.me/forgejo/sscoble/laptop-config/compare/main...t490-dualboot - Commit: 921fc14
agent-engineering was assigned by sscoble 2026-06-06 12:43:13 +00:00
agent-engineering commented 2026-06-06 12:49:27 +00:00
Copy link

Branch review — t490-dualboot (commit 921fc14)

Verdict: findings (correctness bugs in install.sh). Three real bugs found in the new partition-creation logic. All three have been fixed and committed on the same branch as 060194b install.sh: fix swap creation and partition-range bugs (pushed to t490-dualboot). The other changes (modules/laptop.nix extraEntries, MIGRATION.md) look correct.

Findings

1. install.sh — parted mkpart range would overlap the recovery partition (BLOCKING)

install.sh:146 was:

parted -s -a opt "$DISK" mkpart primary ext4 -- -"$NIXOS_SIZE" 100%

That asks parted for a range [disk_size - NIXOS_SIZE, disk_size]. On a stock T490 the recovery partition sits at the end of the disk, so this range overlaps the recovery partition and parted will refuse. The script's intent was to fill the space freed by the ntfsresize shrink (which is in the middle of the disk, after the shrunken Windows partition), not the tail of the disk.

Fix applied in 060194b: compute the start of the freed space as the new end of the (now shrunken) Windows partition, in 1 MiB units, and pass that as the explicit start to parted mkpart. The new partition now lands exactly where the shrink freed space.

2. install.sh — swap partition is advertised but never created (BLOCKING)

The "Plan" block at install.sh:100-106 tells the user:

  1. Create new swap partition: $SWAP_SIZE

…but no swap partition is ever created and swapon is never called. The default SWAP_SIZE=16G means a user running the script out-of-the-box would have a 16 GB phantom partition the menu claims exists.

Fix applied in 060194b: add a second parted mkpart primary linux-swap after the NixOS root, run mkswap + swapon. The total shrink applied to the Windows partition is now NIXOS_SIZE + SWAP_SIZE (so the swap actually fits on disk).

3. install.sh — sort | tail -1 partition discovery is fragile (MEDIUM)

install.sh:151 picked the new partition as lsblk ... | sort | tail -1. That works for the common T490 case (3–5 existing partitions, one new one) but breaks as soon as more than one new partition is created (post-fix, that's NixOS root + swap) and is also fragile for disks with 10+ existing partitions — which the body of the ticket already flagged as the ${DISK}p? glob pitfall.

Fix applied in 060194b: snapshot the partition list before mkpart, then use comm -13 to diff the post-mkpart list and pick the new entries deterministically.

What I did NOT change

  • modules/laptop.nix extraEntries (windows.conf) — Format is correct. The BLS-spec keys (title, efi, sort-key, type oneshot) all match the upstream Boot Loader Spec and current systemd-boot. The ''…'' raw string does produce a leading blank line in the conf, but systemd-boot is tolerant and this is purely cosmetic.
  • ntfsresize --size syntax — Correct. --size is byte count, -s performs the shrink. The unit-aware byte conversion is right (I refactored it into a small size_to_bytes helper for clarity, that's the only change in that area).
  • Edge-case handling in install.sh: the script already fails cleanly when no ESP is found (install.sh:92) or no Windows NTFS partition is found (install.sh:93). I left these messages intact.
  • MIGRATION.md 26.05 notes — Plausible forward-looking notes about boot.initrd.systemd.enable, boot.supportedFilesystems as attrset, and systemd.extraConfig removal. None of these are exercised by the current config so they're no-ops. Caveat: I could not independently verify the 26.05 specifics from this environment (nixpkgs-unstable in June 2026 may or may not track 26.05+). Worth a quick eyeball when Scott first builds on the device. The MIGRATION.md step 4 already flags this as "expected" rather than "verified," which is honest.

Decisions-that-need-review responses

  1. systemd-boot vs GRUB — APPROVE. The explicit extraEntries is the right call for a shared-ESP T490; GRUB + os-prober is a bigger change with more moving parts. Easy to flip later if needed.
  2. ntfsresize requires clean shutdown of Windows — APPROVE (with a suggestion). The current ntfsfix -d step is exactly the right auto-recovery for the forced-shutdown case, but the user-facing install.sh doesn't surface this requirement. Suggestion: add a one-line warn "If you forced-shut Windows, reboot into Windows and run 'chkdsk /f' first — the script will otherwise refuse to shrink." before the ntfsfix -d call. Not blocking, but worth a follow-up commit.
  3. Branch name t490-dualboot — APPROVE (no rename needed for review).

Open questions for Scott

  1. Do you want the README updated to call out the Windows-clean-shutdown prerequisite for ntfsresize, or is the MIGRATION.md already the canonical "read this first" doc? (I left the script as-is to keep this commit scoped to the three correctness bugs.)
  2. After first build on the T490, please confirm whether nixos-unstable in June 2026 actually tracks 26.05+. If not, the MIGRATION.md section "NixOS 26.05 ('Yarara') compatibility" should be retitled or removed.

Artifacts

  • New commit on t490-dualboot: 060194b (060194b install.sh: fix swap creation and partition-range bugs)
  • Branch is now 2 commits ahead of main; pushed to origin/t490-dualboot
  • modules/laptop.nix and MIGRATION.md unchanged from the original 921fc14
## Branch review — `t490-dualboot` (commit `921fc14`) **Verdict: findings (correctness bugs in `install.sh`).** Three real bugs found in the new partition-creation logic. All three have been **fixed and committed on the same branch** as `060194b install.sh: fix swap creation and partition-range bugs` (pushed to `t490-dualboot`). The other changes (`modules/laptop.nix` extraEntries, `MIGRATION.md`) look correct. ### Findings #### 1. `install.sh` — `parted mkpart` range would overlap the recovery partition (BLOCKING) `install.sh:146` was: ```sh parted -s -a opt "$DISK" mkpart primary ext4 -- -"$NIXOS_SIZE" 100% ``` That asks parted for a range `[disk_size - NIXOS_SIZE, disk_size]`. On a stock T490 the recovery partition sits at the end of the disk, so this range overlaps the recovery partition and `parted` will refuse. The script's intent was to fill the space freed by the `ntfsresize` shrink (which is in the middle of the disk, after the shrunken Windows partition), not the tail of the disk. **Fix applied in 060194b:** compute the start of the freed space as the new end of the (now shrunken) Windows partition, in 1 MiB units, and pass that as the explicit start to `parted mkpart`. The new partition now lands exactly where the shrink freed space. #### 2. `install.sh` — swap partition is advertised but never created (BLOCKING) The "Plan" block at `install.sh:100-106` tells the user: > 3. Create new swap partition: $SWAP_SIZE …but no swap partition is ever created and `swapon` is never called. The default `SWAP_SIZE=16G` means a user running the script out-of-the-box would have a 16 GB phantom partition the menu claims exists. **Fix applied in 060194b:** add a second `parted mkpart primary linux-swap` after the NixOS root, run `mkswap` + `swapon`. The total shrink applied to the Windows partition is now `NIXOS_SIZE + SWAP_SIZE` (so the swap actually fits on disk). #### 3. `install.sh` — `sort | tail -1` partition discovery is fragile (MEDIUM) `install.sh:151` picked the new partition as `lsblk ... | sort | tail -1`. That works for the common T490 case (3–5 existing partitions, one new one) but breaks as soon as more than one new partition is created (post-fix, that's NixOS root + swap) and is also fragile for disks with 10+ existing partitions — which the body of the ticket already flagged as the `${DISK}p?` glob pitfall. **Fix applied in 060194b:** snapshot the partition list before `mkpart`, then use `comm -13` to diff the post-`mkpart` list and pick the new entries deterministically. ### What I did NOT change - **`modules/laptop.nix` `extraEntries` (`windows.conf`)** — Format is correct. The BLS-spec keys (`title`, `efi`, `sort-key`, `type oneshot`) all match the upstream Boot Loader Spec and current systemd-boot. The `''…''` raw string does produce a leading blank line in the conf, but systemd-boot is tolerant and this is purely cosmetic. - **`ntfsresize --size` syntax** — Correct. `--size` is byte count, `-s` performs the shrink. The unit-aware byte conversion is right (I refactored it into a small `size_to_bytes` helper for clarity, that's the only change in that area). - **Edge-case handling in `install.sh`:** the script already fails cleanly when no ESP is found (`install.sh:92`) or no Windows NTFS partition is found (`install.sh:93`). I left these messages intact. - **`MIGRATION.md` 26.05 notes** — Plausible forward-looking notes about `boot.initrd.systemd.enable`, `boot.supportedFilesystems` as attrset, and `systemd.extraConfig` removal. None of these are exercised by the current config so they're no-ops. **Caveat:** I could not independently verify the 26.05 specifics from this environment (nixpkgs-unstable in June 2026 may or may not track 26.05+). Worth a quick eyeball when Scott first builds on the device. The MIGRATION.md step 4 already flags this as "expected" rather than "verified," which is honest. ### Decisions-that-need-review responses 1. **systemd-boot vs GRUB** — APPROVE. The explicit `extraEntries` is the right call for a shared-ESP T490; GRUB + os-prober is a bigger change with more moving parts. Easy to flip later if needed. 2. **`ntfsresize` requires clean shutdown of Windows** — APPROVE (with a suggestion). The current `ntfsfix -d` step is exactly the right auto-recovery for the forced-shutdown case, but the user-facing `install.sh` doesn't surface this requirement. **Suggestion:** add a one-line `warn "If you forced-shut Windows, reboot into Windows and run 'chkdsk /f' first — the script will otherwise refuse to shrink."` before the `ntfsfix -d` call. Not blocking, but worth a follow-up commit. 3. **Branch name `t490-dualboot`** — APPROVE (no rename needed for review). ### Open questions for Scott 1. Do you want the README updated to call out the Windows-clean-shutdown prerequisite for `ntfsresize`, or is the MIGRATION.md already the canonical "read this first" doc? (I left the script as-is to keep this commit scoped to the three correctness bugs.) 2. After first build on the T490, please confirm whether `nixos-unstable` in June 2026 actually tracks 26.05+. If not, the MIGRATION.md section "NixOS 26.05 ('Yarara') compatibility" should be retitled or removed. ### Artifacts - New commit on `t490-dualboot`: **`060194b`** (`060194b install.sh: fix swap creation and partition-range bugs`) - Branch is now 2 commits ahead of `main`; pushed to `origin/t490-dualboot` - `modules/laptop.nix` and `MIGRATION.md` unchanged from the original `921fc14`
Sign in to join this conversation.
No Branch/Tag specified
Branches Tags
main
t490-dualboot
No results found.
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
agent-engineering
2 participants
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: sscoble/laptop-config#1
No description provided.
Delete branch "%!s()"

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?