d264371b46
Two related fixes that together close the "minimal wiring" gap behind
`nomarchy.system.features.hybridGPU`.
1. Complete the NVIDIA driver stack inside hardware.nix's hybridGPU
mkIf block.
Before: `hybridGPU = true` enabled supergfxd and... that was it.
supergfxd manages mode switching by black/unblacklisting the nvidia
kernel module, but without the rest of the NVIDIA stack actually
loaded the dGPU has no driver to drive. Hyprland/Wayland silently
stayed on the iGPU regardless of mode.
After: hybridGPU=true also wires
services.xserver.videoDrivers = ["nvidia"] (loads the driver
under Wayland too)
hardware.graphics.{enable,enable32Bit}
hardware.nvidia.modesetting.enable (required for
Wayland)
hardware.nvidia.powerManagement.enable
hardware.nvidia.package = config.boot.kernelPackages
.nvidiaPackages.stable
boot.kernelParams += "nvidia-drm.modeset=1"
All wired with lib.mkDefault so a downstream system.nix can pin a
beta driver, flip to the open kernel module, or set
`hardware.nvidia.prime.{offload.enable, intelBusId, nvidiaBusId}`
for render-offload. The bus IDs are per-machine (find via
`lspci -D`) so they stay user-supplied; docs/OPTIONS.md has the
full recipe.
2. Add lib.mkDefault to every state.json-derived assignment in
core/system/state.nix and core/home/state.nix.
Same priority bug on both sides: assignments like
`features.hybridGPU = systemState.features.hybridGPU or false`
landed at default priority. A downstream system.nix saying
`nomarchy.system.features.hybridGPU = true` would then conflict
with the state-derived value at the same priority, and Nix would
refuse the merge with "conflicting definition values" — the
user's override couldn't take effect.
Verified by an explicit eval: extending the default nixosConfig
with `nomarchy.system.features.hybridGPU = true` now resolves
cleanly and the full driver stack engages.
Side-effect: core/system/state.nix now reads from
lib/state-schema.nix like the home side does, completing the
schema-centralization started two batches ago.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
30 lines
1.4 KiB
Nix
30 lines
1.4 KiB
Nix
{ lib, ... }:
|
|
|
|
let
|
|
nomarchyLib = import ../../lib { inherit lib; };
|
|
# Same canonical schema as core/home/state.nix and the options.nix
|
|
# files — keeps every state default in one place.
|
|
schema = import ../../lib/state-schema.nix { inherit lib; };
|
|
systemState = nomarchyLib.readSystemState;
|
|
in
|
|
{
|
|
# Every assignment is lib.mkDefault so a downstream /etc/nixos/system.nix
|
|
# can still set e.g. `nomarchy.system.features.hybridGPU = true;`
|
|
# without colliding with the state.json-derived value. Without
|
|
# mkDefault, every state.json-driven option was unoverridable from
|
|
# Nix — flipping hybridGPU required jq'ing the state file rather
|
|
# than declaring it in your config.
|
|
config.nomarchy.system = {
|
|
dns = lib.mkDefault (systemState.dns or schema.system.dns);
|
|
customDns = lib.mkDefault (systemState.customDns or schema.system.customDns);
|
|
wifi.powersave = lib.mkDefault (systemState.wifi.powersave or schema.system.wifi.powersave);
|
|
timezone = lib.mkDefault (systemState.timezone or schema.system.timezone);
|
|
features = {
|
|
fingerprint = lib.mkDefault (systemState.features.fingerprint or schema.system.features.fingerprint);
|
|
fido2 = lib.mkDefault (systemState.features.fido2 or schema.system.features.fido2);
|
|
hybridGPU = lib.mkDefault (systemState.features.hybridGPU or schema.system.features.hybridGPU);
|
|
};
|
|
theme = lib.mkDefault (systemState.theme or schema.system.theme);
|
|
};
|
|
}
|