bernardo/Nomarchy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: centralize state defaults via lib/state-schema.nix

Browse Source 
Kills a recurring bug class: state defaults previously lived in three
parallel places that drifted apart over time.

  - lib/state-schema.nix          (the canonical schema, referenced
                                   nowhere except a description string)
  - core/system/options.nix       (default = "..." clauses on options)
  - core/home/options.nix         (same, on home options)
  - core/home/state.nix           (`or "..."` fallbacks for state.json reads)

When `state.json` is missing a key, three files have to agree on the
fallback. They keep silently drifting:

  - The OOTB QA audit shipped fixes for this pattern.
  - Earlier this session, `chore: switch default theme summer-night → nord`
    fixed core/system/options.nix and core/home/state.nix — but missed
    core/home/options.nix, which still defaulted nomarchy.theme to
    "summer-night". Every consumer of the home option
    (features/default.nix, vscode.nix, waybar, hyprland, theme engine)
    resolved to the wrong theme when state.json was blank.

This change:

  - Imports lib/state-schema.nix into all three consumers and replaces
    every hardcoded default with `schema.<scope>.<key>`.
  - Fixes the lingering nomarchy.theme = "summer-night" home-side bug as
    a side-effect.
  - Touches roughly 25 literals across the three files.

Verified `nix flake check --no-build` passes and every centralized value
evaluates to the exact literal it previously had. Off-schema option-only
defaults (isLightMode, formFactor, cursor.*, iconsTheme, keyring.enable,
etc.) are left hardcoded — they have no state.json counterpart, so
there's no source-of-truth split to resolve.

Out of scope (follow-up):
  - Have installer/install.sh generate /mnt/etc/nixos/state.json from
    the schema instead of hardcoded JSON — would close the last
    split-brain surface (the installer can still drift from schema).

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
Bernardo Magri
2026-05-18 17:52:47 +01:00
parent 5ddb15ffef
commit 7fa909ddf4
4 changed files with 56 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
core/home/options.nix
View File

@@ -1,47 +1,52 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
let
# Defaults live in lib/state-schema.nix so they can't drift between this
# file, core/system/options.nix, and core/home/state.nix's `or` fallbacks.
schema = import ../../lib/state-schema.nix { inherit lib; };
in
{ {
options.nomarchy = { options.nomarchy = {
toggles = { toggles = {
suspend = lib.mkOption { suspend = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = true; default = schema.home.suspend;
description = "Whether to show suspend in system menu."; description = "Whether to show suspend in system menu.";
}; };
screensaver = lib.mkOption { screensaver = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = true; default = schema.home.screensaver;
description = "Whether the screensaver is enabled."; description = "Whether the screensaver is enabled.";
}; };
idle = lib.mkOption { idle = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = true; default = schema.home.idle;
description = "Whether the idle lock is enabled."; description = "Whether the idle lock is enabled.";
}; };
nightlight = lib.mkOption { nightlight = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = schema.home.nightlight;
description = "Whether the nightlight is enabled."; description = "Whether the nightlight is enabled.";
}; };
waybar = lib.mkOption { waybar = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = true; default = schema.home.waybar;
description = "Whether the top bar is enabled."; description = "Whether the top bar is enabled.";
}; };
skipVsCodeTheme = lib.mkOption { skipVsCodeTheme = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = schema.home.skipVsCodeTheme;
description = "Whether to skip theme changes in VSCode."; description = "Whether to skip theme changes in VSCode.";
}; };
}; };
nightlightTemperature = lib.mkOption { nightlightTemperature = lib.mkOption {
type = lib.types.int; type = lib.types.int;
default = 4000; default = schema.home.nightlightTemperature;
description = "Temperature for the nightlight."; description = "Temperature for the nightlight.";
}; };
theme = lib.mkOption { theme = lib.mkOption {
type = lib.types.str; type = lib.types.str;
default = "summer-night"; default = schema.home.theme;
description = "System theme name."; description = "System theme name.";
}; };
formFactor = lib.mkOption { formFactor = lib.mkOption {
@@ -58,35 +63,35 @@
}; };
wallpaper = lib.mkOption { wallpaper = lib.mkOption {
type = lib.types.str; type = lib.types.str;
default = ""; default = schema.home.wallpaper;
description = "System wallpaper path."; description = "System wallpaper path.";
}; };
panelPosition = lib.mkOption { panelPosition = lib.mkOption {
type = lib.types.enum [ "top" "bottom" ]; type = lib.types.enum [ "top" "bottom" ];
default = "top"; default = schema.home.panelPosition;
description = "Waybar panel position."; description = "Waybar panel position.";
}; };
hyprland = { hyprland = {
gaps_in = lib.mkOption { gaps_in = lib.mkOption {
type = lib.types.int; type = lib.types.int;
default = 5; default = schema.home.hyprland.gaps_in;
description = "Inner gaps for Hyprland."; description = "Inner gaps for Hyprland.";
}; };
gaps_out = lib.mkOption { gaps_out = lib.mkOption {
type = lib.types.int; type = lib.types.int;
default = 10; default = schema.home.hyprland.gaps_out;
description = "Outer gaps for Hyprland."; description = "Outer gaps for Hyprland.";
}; };
border_size = lib.mkOption { border_size = lib.mkOption {
type = lib.types.int; type = lib.types.int;
default = 2; default = schema.home.hyprland.border_size;
description = "Border size for Hyprland."; description = "Border size for Hyprland.";
}; };
}; };
fonts = { fonts = {
monospace = lib.mkOption { monospace = lib.mkOption {
type = lib.types.str; type = lib.types.str;
default = "JetBrainsMono Nerd Font"; default = schema.home.font;
description = "System monospace font."; description = "System monospace font.";
}; };
}; };

38
core/home/state.nix
View File

@@ -2,6 +2,12 @@
let let
nomarchyLib = import ../../lib { inherit lib; }; 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; assetsPath = ../../themes/palettes;
# Read unified state from ~/.config/nomarchy/state.json # Read unified state from ~/.config/nomarchy/state.json
@@ -11,31 +17,31 @@ in
config = { config = {
nomarchy = { nomarchy = {
toggles = { toggles = {
suspend = togglesState.suspend or true; suspend = togglesState.suspend or schema.home.suspend;
screensaver = togglesState.screensaver or true; screensaver = togglesState.screensaver or schema.home.screensaver;
idle = togglesState.idle or true; idle = togglesState.idle or schema.home.idle;
nightlight = togglesState.nightlight or false; nightlight = togglesState.nightlight or schema.home.nightlight;
waybar = togglesState.waybar or true; waybar = togglesState.waybar or schema.home.waybar;
skipVsCodeTheme = togglesState.skipVsCodeTheme or false; skipVsCodeTheme = togglesState.skipVsCodeTheme or schema.home.skipVsCodeTheme;
}; };
nightlightTemperature = togglesState.nightlightTemperature or 4000; nightlightTemperature = togglesState.nightlightTemperature or schema.home.nightlightTemperature;
theme = togglesState.theme or "nord"; theme = togglesState.theme or schema.home.theme;
wallpaper = togglesState.wallpaper or ""; wallpaper = togglesState.wallpaper or schema.home.wallpaper;
panelPosition = togglesState.panelPosition or "top"; panelPosition = togglesState.panelPosition or schema.home.panelPosition;
hyprland = { hyprland = {
gaps_in = togglesState.hyprland.gaps_in or 5; gaps_in = togglesState.hyprland.gaps_in or schema.home.hyprland.gaps_in;
gaps_out = togglesState.hyprland.gaps_out or 10; gaps_out = togglesState.hyprland.gaps_out or schema.home.hyprland.gaps_out;
border_size = togglesState.hyprland.border_size or 2; border_size = togglesState.hyprland.border_size or schema.home.hyprland.border_size;
}; };
fonts.monospace = togglesState.font or "JetBrainsMono Nerd Font"; fonts.monospace = togglesState.font or schema.home.font;
# Derived properties from the theme directory # Derived properties from the theme directory
isLightMode = nomarchyLib.isThemeLightMode { isLightMode = nomarchyLib.isThemeLightMode {
themeName = togglesState.theme or "nord"; themeName = togglesState.theme or schema.home.theme;
inherit assetsPath; inherit assetsPath;
}; };
iconsTheme = nomarchyLib.getIconsTheme { iconsTheme = nomarchyLib.getIconsTheme {
themeName = togglesState.theme or "nord"; themeName = togglesState.theme or schema.home.theme;
inherit assetsPath; inherit assetsPath;
}; };
}; };

23
core/system/options.nix
View File

@@ -1,27 +1,32 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let
# Defaults live in lib/state-schema.nix so they can't drift between this
# file, core/home/options.nix, and core/home/state.nix's `or` fallbacks.
schema = import ../../lib/state-schema.nix { inherit lib; };
in
{ {
options.nomarchy.system = { options.nomarchy.system = {
dns = lib.mkOption { dns = lib.mkOption {
type = lib.types.enum [ "Cloudflare" "Google" "DHCP" "Custom" ]; type = lib.types.enum [ "Cloudflare" "Google" "DHCP" "Custom" ];
default = "DHCP"; default = schema.system.dns;
description = "Selected DNS provider."; description = "Selected DNS provider.";
}; };
customDns = lib.mkOption { customDns = lib.mkOption {
type = lib.types.listOf lib.types.str; type = lib.types.listOf lib.types.str;
default = []; default = schema.system.customDns;
description = "List of custom DNS servers."; description = "List of custom DNS servers.";
}; };
wifi = { wifi = {
powersave = lib.mkOption { powersave = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = true; default = schema.system.wifi.powersave;
description = "Whether to enable wifi power saving."; description = "Whether to enable wifi power saving.";
}; };
}; };
timezone = lib.mkOption { timezone = lib.mkOption {
type = lib.types.str; type = lib.types.str;
default = "UTC"; default = schema.system.timezone;
description = "System timezone."; description = "System timezone.";
}; };
formFactor = lib.mkOption { formFactor = lib.mkOption {
@@ -39,24 +44,24 @@
features = { features = {
fingerprint = lib.mkOption { fingerprint = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = schema.system.features.fingerprint;
description = "Whether to enable fingerprint support."; description = "Whether to enable fingerprint support.";
}; };
fido2 = lib.mkOption { fido2 = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = schema.system.features.fido2;
description = "Whether to enable FIDO2 support."; description = "Whether to enable FIDO2 support.";
}; };
hybridGPU = lib.mkOption { hybridGPU = lib.mkOption {
type = lib.types.bool; type = lib.types.bool;
default = false; default = schema.system.features.hybridGPU;
description = "Whether to enable hybrid GPU support (supergfxd)."; description = "Whether to enable hybrid GPU support (supergfxd).";
}; };
}; };
theme = lib.mkOption { theme = lib.mkOption {
type = lib.types.str; type = lib.types.str;
default = "nord"; default = schema.system.theme;
description = "Selected system theme. Matches lib/state-schema.nix and the installer-written state.json so a missing/blank state file lands on the same theme everywhere."; description = "Selected system theme.";
}; };
# ----- Tier 1 system features (all opt-in, no behavioural change off) --- # ----- Tier 1 system features (all opt-in, no behavioural change off) ---

1
docs/ROADMAP.md
View File

@@ -121,6 +121,7 @@ Each PR description should reference the row(s) in `docs/SCRIPTS.md` it closes,
(Move items here when they land — keep them brief, link the commit/PR.) (Move items here when they land — keep them brief, link the commit/PR.)
- _2026-05-18_ — Declarative-state defaults centralization. Made `lib/state-schema.nix` the single source of truth for every state-default that previously lived in three places (the schema itself, `core/system/options.nix` / `core/home/options.nix` `default = …` clauses, and `core/home/state.nix` `or …` fallbacks). Replaced ~25 hardcoded literals with `schema.<scope>.<key>` reads. Side-effect: fixed a lingering bug where `core/home/options.nix:theme` still defaulted to `"summer-night"` after the system-side was moved to `"nord"` — half the codebase's home option resolved to the wrong theme when state.json was missing/blank. `nix flake check --no-build` confirms zero semantic change for every other field. Doesn't touch the installer-written `state.json` (separate batch — needs schema → JSON generation).
- _2026-05-18_ — Pillar 7 first step: Forgejo Actions CI (eval + lint). New `.forgejo/workflows/check.yml` runs on every push to `main` and every PR: (1) `nix flake check --no-build` to catch eval regressions, (2) `bash -n` + `shellcheck --severity=error` over every `nomarchy-*` bash script (whole-tree, not just changed files — gates branches that bypass the pre-commit hook), (3) `docs/SCRIPTS.md` drift check (fails loudly if a script change didn't regenerate the audit doc). All three checks pass locally on the current tree. Activation requires enabling Actions on the Forgejo repo and registering a `forgejo-runner`; the workflow itself is dormant until then. ISO build job is intentionally deferred — needs a binary cache (Cachix/Attic) to be tractable. - _2026-05-18_ — Pillar 7 first step: Forgejo Actions CI (eval + lint). New `.forgejo/workflows/check.yml` runs on every push to `main` and every PR: (1) `nix flake check --no-build` to catch eval regressions, (2) `bash -n` + `shellcheck --severity=error` over every `nomarchy-*` bash script (whole-tree, not just changed files — gates branches that bypass the pre-commit hook), (3) `docs/SCRIPTS.md` drift check (fails loudly if a script change didn't regenerate the audit doc). All three checks pass locally on the current tree. Activation requires enabling Actions on the Forgejo repo and registering a `forgejo-runner`; the workflow itself is dormant until then. ISO build job is intentionally deferred — needs a binary cache (Cachix/Attic) to be tractable.
- _2026-05-18_ — **Pillar 3 Phase B: complete.** Final batch (restart/sudo/theme/misc clusters) cleared the last 13 `unused?` rows. Deleted five truly dead scripts: `nomarchy-restart-{hyprctl,mako}` (theme switching calls `hyprctl reload`/`makoctl reload` directly now), `nomarchy-restart-tmux` (one-liner of marginal value), `nomarchy-battery-present` (battery monitor checks `/sys/class/power_supply/BAT*` inline), `nomarchy-sudo-keepalive` (intended-to-be-sourced building block with no users). Surfaced eight useful tools in `SKILL.md` so the audit catches them as `kept` and AI assistants can discover them: `nomarchy-restart-trackpad` (intel_quicki2c reload), `nomarchy-sudo-{passwordless-toggle,reset}`, `nomarchy-theme-{bg-install,refresh,remove}`, `nomarchy-refresh-fastfetch`, `nomarchy-windows-vm` (new Virtualization section). Final state: 159 scripts, all `kept`, `unused?` = 0, missing references = 0. - _2026-05-18_ — **Pillar 3 Phase B: complete.** Final batch (restart/sudo/theme/misc clusters) cleared the last 13 `unused?` rows. Deleted five truly dead scripts: `nomarchy-restart-{hyprctl,mako}` (theme switching calls `hyprctl reload`/`makoctl reload` directly now), `nomarchy-restart-tmux` (one-liner of marginal value), `nomarchy-battery-present` (battery monitor checks `/sys/class/power_supply/BAT*` inline), `nomarchy-sudo-keepalive` (intended-to-be-sourced building block with no users). Surfaced eight useful tools in `SKILL.md` so the audit catches them as `kept` and AI assistants can discover them: `nomarchy-restart-trackpad` (intel_quicki2c reload), `nomarchy-sudo-{passwordless-toggle,reset}`, `nomarchy-theme-{bg-install,refresh,remove}`, `nomarchy-refresh-fastfetch`, `nomarchy-windows-vm` (new Virtualization section). Final state: 159 scripts, all `kept`, `unused?` = 0, missing references = 0.
- _2026-05-18_ — Pillar 3 Phase B: webapp/tui/voxtype install-remove pair triage. Deleted two dead webapp URI handlers (`nomarchy-webapp-handler-hey`, `nomarchy-webapp-handler-zoom`) — no `.desktop` MimeType registration anywhere routed `mailto:`/`zoom:` URIs to them, so the handlers could never fire. Surfaced six useful CLI tools in `SKILL.md` "Common Tasks" so they're discoverable by AI assistants and tagged `kept` by the audit: `nomarchy-webapp-{remove,remove-all}`, `nomarchy-tui-{remove,remove-all}`, `nomarchy-voxtype-{install,remove}`. Script count 166 → 164; `unused?` 21 → 13. - _2026-05-18_ — Pillar 3 Phase B: webapp/tui/voxtype install-remove pair triage. Deleted two dead webapp URI handlers (`nomarchy-webapp-handler-hey`, `nomarchy-webapp-handler-zoom`) — no `.desktop` MimeType registration anywhere routed `mailto:`/`zoom:` URIs to them, so the handlers could never fire. Surfaced six useful CLI tools in `SKILL.md` "Common Tasks" so they're discoverable by AI assistants and tagged `kept` by the audit: `nomarchy-webapp-{remove,remove-all}`, `nomarchy-tui-{remove,remove-all}`, `nomarchy-voxtype-{install,remove}`. Script count 166 → 164; `unused?` 21 → 13.