From 89ae127134765ad62113b0d97bbdf2b1d5e463db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Reynier?= Date: Wed, 29 Oct 2025 09:28:47 +0100 Subject: [PATCH] colorschmes/vscode: drop settingsOptions, add settingsExample --- plugins/colorschemes/vscode.nix | 27 +++++++------------ .../plugins/colorschemes/vscode.nix | 21 +++++++++++++++ 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/plugins/colorschemes/vscode.nix b/plugins/colorschemes/vscode.nix index 82854a37..8f8a42f6 100644 --- a/plugins/colorschemes/vscode.nix +++ b/plugins/colorschemes/vscode.nix @@ -2,9 +2,6 @@ lib, ... }: -let - inherit (lib.nixvim) defaultNullOpts toLuaObject; -in lib.nixvim.plugins.mkNeovimPlugin { name = "vscode"; isColorscheme = true; @@ -14,25 +11,21 @@ lib.nixvim.plugins.mkNeovimPlugin { maintainers = [ lib.maintainers.loicreynier ]; - settingsOptions = { - transparent = defaultNullOpts.mkBool false "Whether to enable transparent background"; - italic_comments = defaultNullOpts.mkBool false "Whether to enable italic comments"; - underline_links = defaultNullOpts.mkBool false "Whether to underline links"; - disable_nvimtree_bg = defaultNullOpts.mkBool true "Whether to disable nvim-tree background"; - color_overrides = defaultNullOpts.mkAttrsOf lib.types.str { } '' - A dictionary of color overrides. - See https://github.com/Mofiqul/vscode.nvim/blob/main/lua/vscode/colors.lua for color names. - ''; - group_overrides = defaultNullOpts.mkAttrsOf lib.types.highlight { } '' - A dictionary of group names, each associated with a dictionary of parameters - (`bg`, `fg`, `sp` and `style`) and colors in hex. - ''; + settingsExample = { + transparent = true; + italic_comments = true; + italic_inlayhints = true; + underline_links = true; + terminal_colors = true; + color_overrides = { + vscLineNumber = "#FFFFFF"; + }; }; extraConfig = cfg: { colorschemes.vscode.luaConfig.content = '' local _vscode = require("vscode") - _vscode.setup(${toLuaObject cfg.settings}) + _vscode.setup(${lib.nixvim.toLuaObject cfg.settings}) _vscode.load() ''; }; diff --git a/tests/test-sources/plugins/colorschemes/vscode.nix b/tests/test-sources/plugins/colorschemes/vscode.nix index 0b526106..93103aac 100644 --- a/tests/test-sources/plugins/colorschemes/vscode.nix +++ b/tests/test-sources/plugins/colorschemes/vscode.nix @@ -4,12 +4,33 @@ }; defaults = { + colorschemes.vscode = { + enable = true; + settings = { + transparent = false; + italic_comments = false; + italic_inlayhints = false; + underline_links = false; + color_overrides = false; + group_overrides = { }; + disable_nvimtree_bg = true; + terminal_colors = true; + }; + }; + }; + + example = { colorschemes.vscode = { enable = true; settings = { transparent = true; italic_comments = true; + italic_inhayhints = true; underline_links = true; + terminal_colors = true; + color_overrides = { + vscLineNumber = "#FFFFFF"; + }; }; }; };