fix(options): drop dead skipVsCodeTheme + 4 themeLoader.apps toggles
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.
This commit is contained in:
@@ -33,11 +33,6 @@ in
|
|||||||
default = schema.home.waybar;
|
default = schema.home.waybar;
|
||||||
description = "Whether the top bar is enabled.";
|
description = "Whether the top bar is enabled.";
|
||||||
};
|
};
|
||||||
skipVsCodeTheme = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
default = schema.home.skipVsCodeTheme;
|
|
||||||
description = "Whether to skip theme changes in VSCode.";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
nightlightTemperature = lib.mkOption {
|
nightlightTemperature = lib.mkOption {
|
||||||
type = lib.types.int;
|
type = lib.types.int;
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ in
|
|||||||
idle = lib.mkDefault (togglesState.idle or schema.home.idle);
|
idle = lib.mkDefault (togglesState.idle or schema.home.idle);
|
||||||
nightlight = lib.mkDefault (togglesState.nightlight or schema.home.nightlight);
|
nightlight = lib.mkDefault (togglesState.nightlight or schema.home.nightlight);
|
||||||
waybar = lib.mkDefault (togglesState.waybar or schema.home.waybar);
|
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);
|
nightlightTemperature = lib.mkDefault (togglesState.nightlightTemperature or schema.home.nightlightTemperature);
|
||||||
theme = lib.mkDefault (togglesState.theme or schema.home.theme);
|
theme = lib.mkDefault (togglesState.theme or schema.home.theme);
|
||||||
|
|||||||
@@ -197,10 +197,6 @@ Without prime config, supergfxd still switches modes but render-offload via `nvi
|
|||||||
|
|
||||||
`bool`, default `true`. Whether the top bar is deployed at all.
|
`bool`, default `true`. Whether the top bar is deployed at all.
|
||||||
|
|
||||||
### `nomarchy.toggles.skipVsCodeTheme`
|
|
||||||
|
|
||||||
`bool`, default `false`. Skip theme overrides in VSCode — useful if you manage VSCode themes yourself.
|
|
||||||
|
|
||||||
### `nomarchy.nightlightTemperature`
|
### `nomarchy.nightlightTemperature`
|
||||||
|
|
||||||
`int`, default `4000`. Nightlight color temperature (Kelvin).
|
`int`, default `4000`. Nightlight color temperature (Kelvin).
|
||||||
@@ -255,11 +251,11 @@ Without prime config, supergfxd still switches modes but render-offload via `nvi
|
|||||||
|
|
||||||
### `nomarchy.themeLoader.enable`
|
### `nomarchy.themeLoader.enable`
|
||||||
|
|
||||||
`bool`, default `true`. Auto-load theme-specific app configs (btop, waybar, mako, kitty, alacritty) from the active theme. Disable if you want to provide your own.
|
`bool`, default `true`. Auto-load theme-specific app configs from the active theme's `apps/` directory. Disable if you want to provide your own.
|
||||||
|
|
||||||
### `nomarchy.themeLoader.apps.{btop,waybar,mako,kitty,alacritty}`
|
### `nomarchy.themeLoader.apps.btop`
|
||||||
|
|
||||||
`bool`, default `true` each. Per-app toggles for the theme loader — pick which apps follow the active theme.
|
`bool`, default `true`. Deploy the active theme's `apps/btop.theme` to `~/.config/btop/themes/nomarchy.theme`. The only per-app toggle in this group — waybar themes inline from `colorScheme` in `features/desktop/waybar`; kitty and alacritty are themed by stylix targets (`themes/engine/stylix.nix`); mako has no theme integration yet.
|
||||||
|
|
||||||
### `nomarchy.overrides.enable`
|
### `nomarchy.overrides.enable`
|
||||||
|
|
||||||
|
|||||||
@@ -71,7 +71,6 @@ let
|
|||||||
NOMARCHY_TOGGLE_IDLE = if config.nomarchy.toggles.idle then "true" else "false";
|
NOMARCHY_TOGGLE_IDLE = if config.nomarchy.toggles.idle then "true" else "false";
|
||||||
NOMARCHY_TOGGLE_NIGHTLIGHT = if config.nomarchy.toggles.nightlight then "true" else "false";
|
NOMARCHY_TOGGLE_NIGHTLIGHT = if config.nomarchy.toggles.nightlight then "true" else "false";
|
||||||
NOMARCHY_TOGGLE_WAYBAR = if config.nomarchy.toggles.waybar then "true" else "false";
|
NOMARCHY_TOGGLE_WAYBAR = if config.nomarchy.toggles.waybar then "true" else "false";
|
||||||
NOMARCHY_TOGGLE_SKIP_VSCODE_THEME = if config.nomarchy.toggles.skipVsCodeTheme then "true" else "false";
|
|
||||||
NOMARCHY_MONOSPACE_FONT = config.nomarchy.fonts.monospace;
|
NOMARCHY_MONOSPACE_FONT = config.nomarchy.fonts.monospace;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,6 @@
|
|||||||
idle = true;
|
idle = true;
|
||||||
nightlight = false;
|
nightlight = false;
|
||||||
waybar = true;
|
waybar = true;
|
||||||
skipVsCodeTheme = false;
|
|
||||||
|
|
||||||
# Hyprland window manager settings
|
# Hyprland window manager settings
|
||||||
hyprland = {
|
hyprland = {
|
||||||
|
|||||||
@@ -54,31 +54,16 @@ in
|
|||||||
};
|
};
|
||||||
|
|
||||||
apps = {
|
apps = {
|
||||||
|
# waybar, kitty, alacritty, and mako are intentionally absent. Waybar
|
||||||
|
# themes inline in features/desktop/waybar via colorScheme; kitty and
|
||||||
|
# alacritty are themed by stylix targets (themes/engine/stylix.nix); mako
|
||||||
|
# has no theme integration yet. Only btop is loaded from the active
|
||||||
|
# theme's apps/ directory.
|
||||||
btop = lib.mkOption {
|
btop = lib.mkOption {
|
||||||
type = lib.types.bool;
|
type = lib.types.bool;
|
||||||
default = true;
|
default = true;
|
||||||
description = "Whether to load btop theme from active theme.";
|
description = "Whether to load btop theme from active theme.";
|
||||||
};
|
};
|
||||||
waybar = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
default = true;
|
|
||||||
description = "Whether to load waybar CSS from active theme.";
|
|
||||||
};
|
|
||||||
mako = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
default = true;
|
|
||||||
description = "Whether to load mako config from active theme.";
|
|
||||||
};
|
|
||||||
kitty = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
default = true;
|
|
||||||
description = "Whether to load kitty config from active theme.";
|
|
||||||
};
|
|
||||||
alacritty = lib.mkOption {
|
|
||||||
type = lib.types.bool;
|
|
||||||
default = true;
|
|
||||||
description = "Whether to load alacritty config from active theme.";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user