b82954a7b5
Two clusters of documented-but-non-functional options surfaced during
the Pillar 8 audit, both setting toggles that have zero runtime effect.
1. `nomarchy.toggles.skipVsCodeTheme` was declared in
core/home/options.nix, defaulted from lib/state-schema.nix, and
surfaced as `NOMARCHY_TOGGLE_SKIP_VSCODE_THEME` env var in
features/scripts/default.nix — but `features/apps/vscode.nix` always
sets `workbench.colorTheme` unconditionally, and no script reads the
env var. Setting the toggle to true did nothing. Removed from
options, schema, state, env-var export, and OPTIONS.md.
2. `nomarchy.themeLoader.apps.{waybar,mako,kitty,alacritty}` were
declared in themes/engine/loader.nix but only `btop` is actually
wired (line 87 gates the per-theme btop.theme deploy). The other
four had no consumer. The actual theming pipeline for those apps is
elsewhere: waybar themes inline from `colorScheme` in waybar.nix;
kitty and alacritty are themed by stylix targets in
themes/engine/stylix.nix; mako has no theme integration at all.
Removed the four dead options + updated OPTIONS.md to list only
btop with a note about where the other apps' theming lives.
53 lines
2.5 KiB
Nix
53 lines
2.5 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);
|
|
};
|
|
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;
|
|
});
|
|
};
|
|
};
|
|
}
|