Repository navigation
Drop the kms hook when the proprietary NVIDIA driver handles early KMS - #6791
Conversation
install/hardware/nvidia.sh early-loads nvidia_drm (modeset=1) for early KMS, but HOOKS still carried the kms hook, so autodetect pulled nouveau and ~100 MB of its GSP firmware into every initramfs for a driver that never runs. On a Limine UKI setup that meant a 256 MB image where ~144 MB is normal, doubled again by the fallback history on /boot. Filter kms out of HOOKS when nvidia_drm is in MODULES (nvidia.conf sorts before this drop-in) and every PCI display controller is NVIDIA. Hybrid systems keep kms so the iGPU retains early KMS at the LUKS prompt. Verified on an RTX 4090 (nvidia-open-dkms 610.57.04): UKI shrinks 256,183,296 -> 144,066,048 bytes, nouveau and its firmware gone, the nvidia-utils GSP blobs and all four nvidia modules retained, Plymouth still owns the LUKS prompt via nvidia_drm. Fixes omacom#6790 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
There was a problem hiding this comment.
Pull request overview
Conditionally removes the kms initramfs hook on NVIDIA-only systems while preserving it for hybrid graphics.
Changes:
- Detects proprietary NVIDIA early KMS configuration.
- Retains
kmswhen a non-NVIDIA display controller exists.
Tip
If you aren't ready for review, convert to a draft PR.
Click "Convert to draft" or run gh pr ready --undo.
Click "Ready for review" or run gh pr ready to reengage.
Suppressed comments (1)
etc/mkinitcpio.conf.d/omarchy_hooks.conf:19
- The
kmsstring literal should be quoted to follow the Bash comparison convention documented inAGENTS.md:17.
[[ $_omarchy_hook == kms ]] || _omarchy_hooks+=("$_omarchy_hook")
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Quote fixed string literals in the [[ ]] comparisons per AGENTS.md, and read the PCI tree through OMARCHY_PCI_DEVICES_PATH, the same seam bin/omarchy-hw-nvidia already uses. Require a positively identified NVIDIA display controller before dropping kms: an empty or unreadable PCI tree previously counted as "no non-NVIDIA GPU" and would have dropped the hook. Unexpected trees now keep kms. Cover the conditional in test/shell.d/nvidia-kms-hook-test.sh: nvidia-only, hybrid, no nvidia_drm, MODULES unset under set -u, audio-function-only, empty tree, and a device directory missing its sysfs attributes. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
|
Addressed the review in b1058de:
Filed by Claude Fable 5 via Claude Code. |
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.
Suppressed comments (1)
etc/mkinitcpio.conf.d/omarchy_hooks.conf:15
- This skips an unreadable PCI function without marking detection as inconclusive. If a readable NVIDIA GPU exists beside that function,
_omarchy_nvidia_gpubecomes true while_omarchy_other_gpustays false, sokmsis removed even though the code could not verify that every display controller is NVIDIA. Treat an unreadable entry conservatively so the documented fallback actually applies.
[[ -r $_omarchy_pci/class && -r $_omarchy_pci/vendor ]] || continue
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.
Suppressed comments (2)
etc/mkinitcpio.conf.d/omarchy_hooks.conf:15
- Unreadable entries are skipped, so a tree with one readable NVIDIA GPU plus an unreadable second device still removes
kms. That does not establish that every display controller is NVIDIA and defeats the documented fail-safe if the unreadable device is another GPU. Treat an unreadable entry as unknown so the filter keepskms; the test should also cover this mixed case.
[[ -r $_omarchy_pci/class && -r $_omarchy_pci/vendor ]] || continue
test/shell.d/nvidia-kms-hook-test.sh:38
- This sources the host's
/etc/vconsole.confunderset -u, making the new test machine-dependent. The repository itself notes that this file may contain onlyKEYMAP(migrations/1784476564.sh:11); in that valid case the later${XKBLAYOUT%%,*}expansion aborts before any NVIDIA assertion runs. Initialize the unrelated mkinitcpio inputs before sourcing the config.
OMARCHY_PCI_DEVICES_PATH="$tmp_dir/devices" bash -uc "
$modules_decl
A device whose class/vendor attributes cannot be read could be another GPU, so skipping it let a readable NVIDIA GPU beside it drop kms without having verified the whole tree. Count it as a non-NVIDIA sighting so kms stays, and cover the mixed case in the test. The test also sourced the host's /etc/vconsole.conf under set -u, where a valid KEYMAP-only file makes the XKBLAYOUT expansion fail in the subshell and ties the result to the machine running it. Predefine XKBLAYOUT and FILES before sourcing the config. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
|
The suppressed review comments were both right, addressed in 94ed33e:
Filed by Claude Fable 5 via Claude Code. |
The settings package deploys the new omarchy_hooks.conf conditional, but nothing rebuilds the initramfs when only a mkinitcpio drop-in changes, so existing NVIDIA-only installs would carry nouveau's ~100 MB of GSP firmware until their next kernel update. Following the precedent of 1784476564, add a migration that rebuilds via limine-mkinitcpio — once per machine, and only where evaluating the installed drop-ins shows the conditional actually dropped kms, so hybrid machines, non-NVIDIA machines, and user-edited configs are left alone. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
A later-sorting drop-in that resets MODULES outright (as surface_device_modules.conf does) would strip nvidia_drm after kms was already dropped. Every machine Omarchy writes such a file for is hybrid Intel and keeps kms through the PCI scan, but that is worth stating so the invariant is not broken by accident. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
|
Reviewed this against the codebase, pushed two fixup commits (e66ccc7, 5d5cc06), and ran an adversarial What I checked and found sound
What was missing: existing installs never rebuild
Codex review (xhigh) findings and disposition
— 🤖 Claude, posting on behalf of @dhh |
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 4 out of 4 changed files in this pull request and generated no new comments.
Suppressed comments (1)
migrations/1786605598.sh:1
- The PR description says this update needs “no migration,” but this file adds a machine-wide migration specifically because the settings update does not rebuild the initramfs. Please update the PR description to reflect that existing Limine installs are rebuilt once by this migration; otherwise the stated rollout behavior contradicts the implementation.
echo "Rebuild the initramfs so NVIDIA-only systems shed nouveau's unused GSP firmware"
|
Please test the updated implementation 🙏 |
|
Tested the updated implementation at 5d5cc06 (includes matjam's b1058de + 94ed33e and the two fixup commits). Test runs
Direct simulation of the conditional against fabricated sysfs trees, all behaving as intended:
The third row is the important regression check on 94ed33e: the inconclusive path only fires when Verdict: sound. Nothing further to fix from my side. — 🤖 Claude, posting on behalf of @dhh |
omacom#6791) * Drop the kms hook when the proprietary NVIDIA driver handles early KMS install/hardware/nvidia.sh early-loads nvidia_drm (modeset=1) for early KMS, but HOOKS still carried the kms hook, so autodetect pulled nouveau and ~100 MB of its GSP firmware into every initramfs for a driver that never runs. On a Limine UKI setup that meant a 256 MB image where ~144 MB is normal, doubled again by the fallback history on /boot. Filter kms out of HOOKS when nvidia_drm is in MODULES (nvidia.conf sorts before this drop-in) and every PCI display controller is NVIDIA. Hybrid systems keep kms so the iGPU retains early KMS at the LUKS prompt. Verified on an RTX 4090 (nvidia-open-dkms 610.57.04): UKI shrinks 256,183,296 -> 144,066,048 bytes, nouveau and its firmware gone, the nvidia-utils GSP blobs and all four nvidia modules retained, Plymouth still owns the LUKS prompt via nvidia_drm. Fixes omacom#6790 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Address review: quote literals, harden PCI detection, add shell tests Quote fixed string literals in the [[ ]] comparisons per AGENTS.md, and read the PCI tree through OMARCHY_PCI_DEVICES_PATH, the same seam bin/omarchy-hw-nvidia already uses. Require a positively identified NVIDIA display controller before dropping kms: an empty or unreadable PCI tree previously counted as "no non-NVIDIA GPU" and would have dropped the hook. Unexpected trees now keep kms. Cover the conditional in test/shell.d/nvidia-kms-hook-test.sh: nvidia-only, hybrid, no nvidia_drm, MODULES unset under set -u, audio-function-only, empty tree, and a device directory missing its sysfs attributes. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Treat unreadable PCI devices as inconclusive and make the test hermetic A device whose class/vendor attributes cannot be read could be another GPU, so skipping it let a readable NVIDIA GPU beside it drop kms without having verified the whole tree. Count it as a non-NVIDIA sighting so kms stays, and cover the mixed case in the test. The test also sourced the host's /etc/vconsole.conf under set -u, where a valid KEYMAP-only file makes the XKBLAYOUT expansion fail in the subshell and ties the result to the machine running it. Predefine XKBLAYOUT and FILES before sourcing the config. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Rebuild existing initramfses once the kms hook no longer applies The settings package deploys the new omarchy_hooks.conf conditional, but nothing rebuilds the initramfs when only a mkinitcpio drop-in changes, so existing NVIDIA-only installs would carry nouveau's ~100 MB of GSP firmware until their next kernel update. Following the precedent of 1784476564, add a migration that rebuilds via limine-mkinitcpio — once per machine, and only where evaluating the installed drop-ins shows the conditional actually dropped kms, so hybrid machines, non-NVIDIA machines, and user-edited configs are left alone. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> * Document the mid-sourcing MODULES caveat in the kms conditional A later-sorting drop-in that resets MODULES outright (as surface_device_modules.conf does) would strip nvidia_drm after kms was already dropped. Every machine Omarchy writes such a file for is hybrid Intel and keeps kms through the PCI scan, but that is worth stating so the invariant is not broken by accident. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> --------- Co-authored-by: Claude Fable 5 <noreply@anthropic.com> Co-authored-by: David Heinemeier Hansson <david@hey.com>
Fixes #6790.
install/hardware/nvidia.shearly-loadsnvidia_drm(withmodeset=1) for early KMS, butHOOKSstill carries thekmshook, soautodetectpulls nouveau — and ~100 MB of its GSP firmware — into every initramfs for a driver that never runs. On a Limine UKI setup that means a 256 MB image where ~144 MB is normal, doubled again by the fallback history on/boot.Change
omarchy_hooks.confnow filterskmsout ofHOOKSwhen both hold:nvidia_drmis inMODULES— i.e.nvidia.conf, which sorts before this drop-in, configured proprietary early KMS;class 0x03xxin sysfs) has NVIDIA's vendor ID.Hybrid iGPU+dGPU systems keep
kmsso the iGPU retains early KMS at the LUKS prompt. Non-NVIDIA systems are untouched. Because the conditional lives in the settings-package config, existing installs pick it up on their next settings update + initramfs rebuild — no migration needed.Testing
nvidia_drminMODULESagainst real sysfs on an RTX 4090 system:kmsdropped.nvidia_drm, and withMODULESunset underset -u:HOOKSunchanged, no errors.kmskept.nouveau.koand its firmware gone; the twonvidia-utilsGSP blobs and all four nvidia modules retained; Plymouth still owns the LUKS prompt vianvidia_drm.Filed by Claude Fable 5 via Claude Code.
🤖 Generated with Claude Code