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>
54 lines
2.6 KiB
Nix
54 lines
2.6 KiB
Nix
{ config, lib, ... }:
|
|
|
|
let
|
|
nomarchyLib = import ../../lib { inherit lib; };
|
|
# Single source of truth for default values when state.json is missing
|
|
# a key. Both core/system/options.nix and core/home/options.nix read
|
|
# from this same file — changing a default in one place updates
|
|
# everywhere. (Was: each consumer hardcoded its own `or X` literal,
|
|
# which is how the summer-night/nord split lived for so long.)
|
|
schema = import ../../lib/state-schema.nix { inherit lib; };
|
|
assetsPath = ../../themes/palettes;
|
|
|
|
# Read unified state from ~/.config/nomarchy/state.json
|
|
togglesState = nomarchyLib.readHomeState config.home.homeDirectory;
|
|
in
|
|
{
|
|
# Every assignment uses lib.mkDefault so a downstream /etc/nixos/home.nix
|
|
# can override the state.json-derived value. Without mkDefault, every
|
|
# option here would resolve at default priority and conflict on
|
|
# assignment from the user's config.
|
|
config = {
|
|
nomarchy = {
|
|
toggles = {
|
|
suspend = lib.mkDefault (togglesState.suspend or schema.home.suspend);
|
|
screensaver = lib.mkDefault (togglesState.screensaver or schema.home.screensaver);
|
|
idle = lib.mkDefault (togglesState.idle or schema.home.idle);
|
|
nightlight = lib.mkDefault (togglesState.nightlight or schema.home.nightlight);
|
|
waybar = lib.mkDefault (togglesState.waybar or schema.home.waybar);
|
|
skipVsCodeTheme = lib.mkDefault (togglesState.skipVsCodeTheme or schema.home.skipVsCodeTheme);
|
|
};
|
|
nightlightTemperature = lib.mkDefault (togglesState.nightlightTemperature or schema.home.nightlightTemperature);
|
|
theme = lib.mkDefault (togglesState.theme or schema.home.theme);
|
|
wallpaper = lib.mkDefault (togglesState.wallpaper or schema.home.wallpaper);
|
|
panelPosition = lib.mkDefault (togglesState.panelPosition or schema.home.panelPosition);
|
|
hyprland = {
|
|
gaps_in = lib.mkDefault (togglesState.hyprland.gaps_in or schema.home.hyprland.gaps_in);
|
|
gaps_out = lib.mkDefault (togglesState.hyprland.gaps_out or schema.home.hyprland.gaps_out);
|
|
border_size = lib.mkDefault (togglesState.hyprland.border_size or schema.home.hyprland.border_size);
|
|
};
|
|
fonts.monospace = lib.mkDefault (togglesState.font or schema.home.font);
|
|
|
|
# Derived properties from the theme directory
|
|
isLightMode = lib.mkDefault (nomarchyLib.isThemeLightMode {
|
|
themeName = togglesState.theme or schema.home.theme;
|
|
inherit assetsPath;
|
|
});
|
|
iconsTheme = lib.mkDefault (nomarchyLib.getIconsTheme {
|
|
themeName = togglesState.theme or schema.home.theme;
|
|
inherit assetsPath;
|
|
});
|
|
};
|
|
};
|
|
}
|