diff --git a/core/home/options.nix b/core/home/options.nix index d309a98..e19e053 100644 --- a/core/home/options.nix +++ b/core/home/options.nix @@ -33,11 +33,6 @@ in default = schema.home.waybar; 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 { type = lib.types.int; diff --git a/core/home/state.nix b/core/home/state.nix index 0bb12f0..a5149b0 100644 --- a/core/home/state.nix +++ b/core/home/state.nix @@ -26,7 +26,6 @@ in 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); diff --git a/docs/OPTIONS.md b/docs/OPTIONS.md index 1cb3c96..bdc803b 100644 --- a/docs/OPTIONS.md +++ b/docs/OPTIONS.md @@ -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. -### `nomarchy.toggles.skipVsCodeTheme` - -`bool`, default `false`. Skip theme overrides in VSCode — useful if you manage VSCode themes yourself. - ### `nomarchy.nightlightTemperature` `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` -`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` diff --git a/features/scripts/default.nix b/features/scripts/default.nix index fd9d766..5734c64 100644 --- a/features/scripts/default.nix +++ b/features/scripts/default.nix @@ -71,7 +71,6 @@ let 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_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; }; diff --git a/lib/state-schema.nix b/lib/state-schema.nix index 50bb2d5..d4723ed 100644 --- a/lib/state-schema.nix +++ b/lib/state-schema.nix @@ -26,7 +26,6 @@ idle = true; nightlight = false; waybar = true; - skipVsCodeTheme = false; # Hyprland window manager settings hyprland = { diff --git a/themes/engine/loader.nix b/themes/engine/loader.nix index 0db65a7..efbc8f4 100644 --- a/themes/engine/loader.nix +++ b/themes/engine/loader.nix @@ -54,31 +54,16 @@ in }; 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 { type = lib.types.bool; default = true; 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."; - }; }; };