feat(colors): add Neovim wallpaper theming and update failure surfacing

scripts/colors/modules/30-editors.sh

@@ -12,6 +12,9 @@ REPO_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
 VSCODE_THEMEGEN_BIN="$STATE_DIR/user/generated/bin/inir-vscode-themegen"
 OPENCODE_THEMEGEN_BIN="$STATE_DIR/user/generated/bin/inir-opencode-themegen"
 ZED_THEMEGEN_BIN="$STATE_DIR/user/generated/bin/inir-zed-themegen"
+NEOVIM_CONFIG_DIR="$XDG_CONFIG_HOME/nvim"
+NEOVIM_PLUGIN_DIR="$NEOVIM_CONFIG_DIR/lua/plugins"
+NEOVIM_THEME_FILE="$NEOVIM_PLUGIN_DIR/neovim.lua"
 
 ensure_vscode_themegen() {
   command -v go &>/dev/null || return 1
@@ -40,16 +43,203 @@ ensure_zed_themegen() {
   [[ -x "$ZED_THEMEGEN_BIN" ]]
 }
 
+json_color() {
+  local file_path="$1"
+  local key="$2"
+  local fallback="$3"
+  if [[ -f "$file_path" ]]; then
+    jq -r --arg key "$key" --arg fallback "$fallback" '.[$key] // $fallback' "$file_path" 2>/dev/null || printf '%s\n' "$fallback"
+  else
+    printf '%s\n' "$fallback"
+  fi
+}
+
+generate_neovim_spec() {
+  mkdir -p "$NEOVIM_PLUGIN_DIR"
+  local tmp_file="${NEOVIM_THEME_FILE}.tmp"
+  cat > "$tmp_file" <<EOF
+local generated_dir = vim.fn.expand("~/.local/state/quickshell/user/generated")
+local palette_file = generated_dir .. "/palette.json"
+local terminal_file = generated_dir .. "/terminal.json"
+local legacy_colors_file = generated_dir .. "/colors.json"
+
+local function read_json(path)
+  local ok, lines = pcall(vim.fn.readfile, path)
+  if not ok or not lines or vim.tbl_isempty(lines) then
+    return {}
+  end
+
+  local ok_decode, decoded = pcall(vim.json.decode, table.concat(lines, "\n"))
+  if not ok_decode or type(decoded) ~= "table" then
+    return {}
+  end
+
+  return decoded
+end
+
+local function load_inir_colors()
+  local palette = read_json(palette_file)
+  if vim.tbl_isempty(palette) then
+    palette = read_json(legacy_colors_file)
+  end
+  local terminal = read_json(terminal_file)
+
+  local function pick(tbl, key, fallback)
+    local value = tbl[key]
+    return type(value) == "string" and value ~= "" and value or fallback
+  end
+
+  local fg = pick(palette, "on_background", "#E8E1DE")
+  local blue = pick(terminal, "term4", "#B19FB6")
+  local yellow = pick(terminal, "term11", "#E2CBB5")
+
+  return {
+    bg = pick(palette, "background", "#151311"),
+    dark_bg = pick(palette, "surface_container_low", "#1E1B19"),
+    darker_bg = pick(palette, "surface_container_lowest", "#100D0C"),
+    lighter_bg = pick(palette, "surface_container_highest", "#383432"),
+
+    fg = fg,
+    dark_fg = pick(palette, "on_surface_variant", "#CFC4BD"),
+    light_fg = pick(terminal, "term15", fg),
+    bright_fg = pick(palette, "inverse_surface", fg),
+    muted = pick(palette, "outline", "#998F88"),
+
+    red = pick(terminal, "term1", "#CA917F"),
+    yellow = yellow,
+    orange = pick(palette, "primary", "#F3D9C5"),
+    green = pick(terminal, "term2", "#BBBB97"),
+    cyan = pick(terminal, "term6", "#B5C8AA"),
+    blue = blue,
+    purple = pick(terminal, "term5", "#BF9EA4"),
+    brown = pick(palette, "secondary_container", "#50443B"),
+
+    bright_red = pick(terminal, "term9", "#DDB2A6"),
+    bright_yellow = yellow,
+    bright_green = pick(terminal, "term10", "#D4D4B0"),
+    bright_cyan = pick(terminal, "term14", "#D6E9CA"),
+    bright_blue = pick(terminal, "term12", "#D2C0D9"),
+    bright_purple = pick(terminal, "term13", "#E0BFC6"),
+
+    accent = pick(palette, "primary", blue),
+    cursor = fg,
+    foreground = fg,
+    background = pick(palette, "background", "#151311"),
+    selection = pick(palette, "surface_container_high", "#2D2928"),
+    selection_foreground = fg,
+    selection_background = pick(palette, "surface_container_high", "#2D2928"),
+  }
+end
+
+return {
+  {
+    "bjarneo/aether.nvim",
+    branch = "v3",
+    name = "inir-neovim",
+    priority = 1000,
+    opts = {
+      colors = load_inir_colors(),
+    },
+    config = function(_, opts)
+      local uv = vim.uv or vim.loop
+      local watched_files = {
+        ["palette.json"] = true,
+        ["terminal.json"] = true,
+        ["colors.json"] = true,
+      }
+
+      local function apply_inir_theme(next_opts)
+        next_opts = vim.tbl_deep_extend("force", next_opts or {}, {
+          colors = load_inir_colors(),
+        })
+        require("aether").setup(next_opts)
+        vim.cmd.colorscheme("aether")
+      end
+
+      local function reload_inir_theme()
+        if vim.g.colors_name ~= "aether" then
+          return
+        end
+
+        apply_inir_theme(opts)
+        vim.cmd("redraw!")
+      end
+
+      apply_inir_theme(opts)
+      require("aether.hotreload").setup()
+
+      if vim.g.inir_aether_watch_started == 1 or not uv then
+        return
+      end
+
+      local reload_pending = false
+      local watchers = {}
+
+      local function schedule_reload()
+        if reload_pending then
+          return
+        end
+
+        reload_pending = true
+        vim.defer_fn(function()
+          reload_pending = false
+          reload_inir_theme()
+        end, 120)
+      end
+
+      local fs_event = uv.new_fs_event()
+      if fs_event then
+        fs_event:start(generated_dir, {}, function(err, fname)
+          if err then
+            return
+          end
+          if fname and not watched_files[fname] then
+            return
+          end
+          schedule_reload()
+        end)
+        watchers[#watchers + 1] = fs_event
+      end
+
+      if #watchers == 0 then
+        return
+      end
+
+      vim.g.inir_aether_watch_started = 1
+      vim.__inir_aether_fs_events = watchers
+    end,
+  },
+  {
+    "LazyVim/LazyVim",
+    opts = {
+      colorscheme = "aether",
+    },
+  },
+}
+EOF
+  if [[ -f "$NEOVIM_THEME_FILE" ]] && cmp -s "$tmp_file" "$NEOVIM_THEME_FILE"; then
+    rm -f "$tmp_file"
+    return 0
+  fi
+
+  mv "$tmp_file" "$NEOVIM_THEME_FILE"
+}
+
 apply_code_editors() {
   [[ -f "$SCSS_FILE" ]] || return 0
   local colors_file="$PALETTE_FILE"
   [[ -f "$colors_file" ]] || colors_file="$LEGACY_COLORS_FILE"
   local python_cmd
   python_cmd=$(venv_python)
 
-  local enable_zed enable_vscode
+  local enable_zed enable_vscode enable_neovim
   enable_zed=$(config_json 'if .appearance.wallpaperTheming | has("enableZed") then .appearance.wallpaperTheming.enableZed else true end' true)
   enable_vscode=$(config_json 'if .appearance.wallpaperTheming | has("enableVSCode") then .appearance.wallpaperTheming.enableVSCode else true end' true)
+  enable_neovim=$(config_json 'if .appearance.wallpaperTheming | has("enableNeovim") then .appearance.wallpaperTheming.enableNeovim else true end' true)
+
+  if [[ "$enable_neovim" == 'true' ]] && [[ -d "$NEOVIM_CONFIG_DIR" || -x "$(command -v nvim 2>/dev/null)" ]]; then
+    generate_neovim_spec "$colors_file" "$TERMINAL_FILE"
+  fi
 
   if [[ "$enable_zed" == 'true' ]] && { command -v zed &>/dev/null || command -v zeditor &>/dev/null; }; then
     if ensure_zed_themegen; then

scripts/colors/targets/editors.json

@@ -4,6 +4,6 @@
   "module": "30-editors.sh",
   "category": "editor",
   "inputs": ["palette.json", "terminal.json", "material_colors.scss"],
-  "description": "Apply themes for VSCode forks, Zed, and OpenCode using generated shell and terminal palettes.",
-  "configKey": "appearance.wallpaperTheming.enableVSCode"
+  "description": "Apply themes for VSCode forks, Zed, OpenCode, and Neovim/LazyVim using generated shell and terminal palettes.",
+  "configKey": "appearance.wallpaperTheming.enableAppsAndShell"
 }