From a3aa4e49d12555e654c70ce97bff894e4ea65250 Mon Sep 17 00:00:00 2001 From: Snoweuph Date: Mon, 13 Apr 2026 08:34:26 +0200 Subject: [PATCH] chore: preset enable docs --- docs/manual/release-notes/rl-0.9.md | 3 +- lib/types/default.nix | 2 + lib/types/lsp.nix | 12 ++ modules/extra/deprecations.nix | 6 + .../lsp/presets/arduino-language-server.nix | 4 +- modules/plugins/lsp/presets/asm-lsp.nix | 4 +- .../lsp/presets/astro-language-server.nix | 4 +- modules/plugins/lsp/presets/basedpyright.nix | 4 +- .../lsp/presets/bash-language-server.nix | 4 +- modules/plugins/lsp/presets/ccls.nix | 4 +- modules/plugins/lsp/presets/clangd.nix | 4 +- modules/plugins/lsp/presets/clojure-lsp.nix | 4 +- modules/plugins/lsp/presets/cue.nix | 4 +- modules/plugins/lsp/presets/dart.nix | 4 +- modules/plugins/lsp/presets/deno.nix | 4 +- modules/plugins/lsp/presets/elixir-ls.nix | 4 +- .../lsp/presets/elm-language-server.nix | 4 +- modules/plugins/lsp/presets/emmet-ls.nix | 4 +- .../plugins/lsp/presets/fsautocomplete.nix | 4 +- modules/plugins/lsp/presets/gleam.nix | 4 +- modules/plugins/lsp/presets/glsl_analyzer.nix | 4 +- modules/plugins/lsp/presets/gopls.nix | 4 +- modules/plugins/lsp/presets/harper.nix | 63 +++++----- modules/plugins/lsp/presets/helm-ls.nix | 4 +- modules/plugins/lsp/presets/intelephense.nix | 4 +- .../lsp/presets/jdt-language-server.nix | 4 +- modules/plugins/lsp/presets/jinja-lsp.nix | 4 +- modules/plugins/lsp/presets/jq-lsp.nix | 4 +- .../lsp/presets/julia-languageserver.nix | 4 +- modules/plugins/lsp/presets/just-lsp.nix | 4 +- .../lsp/presets/kotlin-language-server.nix | 4 +- modules/plugins/lsp/presets/lemminx.nix | 4 +- .../lsp/presets/lua-language-server.nix | 4 +- .../plugins/lsp/presets/markdown-oxide.nix | 4 +- modules/plugins/lsp/presets/marksman.nix | 4 +- modules/plugins/lsp/presets/neocmakelsp.nix | 4 +- modules/plugins/lsp/presets/nil.nix | 4 +- modules/plugins/lsp/presets/nimlsp.nix | 4 +- modules/plugins/lsp/presets/nixd.nix | 4 +- modules/plugins/lsp/presets/nushell.nix | 4 +- modules/plugins/lsp/presets/ocaml-lsp.nix | 4 +- modules/plugins/lsp/presets/ols.nix | 4 +- modules/plugins/lsp/presets/openscad-lsp.nix | 4 +- modules/plugins/lsp/presets/phan.nix | 4 +- modules/plugins/lsp/presets/phpactor.nix | 4 +- modules/plugins/lsp/presets/pyrefly.nix | 4 +- modules/plugins/lsp/presets/pyright.nix | 4 +- .../plugins/lsp/presets/python-lsp-server.nix | 4 +- modules/plugins/lsp/presets/qmlls.nix | 4 +- .../plugins/lsp/presets/r-languageserver.nix | 4 +- modules/plugins/lsp/presets/ruby-lsp.nix | 4 +- modules/plugins/lsp/presets/ruff.nix | 4 +- modules/plugins/lsp/presets/rumdl.nix | 4 +- modules/plugins/lsp/presets/solargraph.nix | 4 +- modules/plugins/lsp/presets/sqls.nix | 4 +- modules/plugins/lsp/presets/superhtml.nix | 4 +- .../lsp/presets/svelte-language-server.nix | 4 +- .../presets/tailwindcss-language-server.nix | 118 +++++++++--------- modules/plugins/lsp/presets/taplo.nix | 4 +- modules/plugins/lsp/presets/terraform-ls.nix | 4 +- modules/plugins/lsp/presets/texlab.nix | 4 +- modules/plugins/lsp/presets/tinymist.nix | 4 +- modules/plugins/lsp/presets/tofu-ls.nix | 4 +- modules/plugins/lsp/presets/tombi.nix | 4 +- .../lsp/presets/twig-language-server.nix | 4 +- modules/plugins/lsp/presets/ty.nix | 4 +- modules/plugins/lsp/presets/typescript-go.nix | 4 +- .../presets/typescript-language-server.nix | 4 +- .../lsp/presets/vala-language-server.nix | 4 +- .../presets/vscode-css-language-server.nix | 4 +- .../presets/vscode-json-language-server.nix | 4 +- modules/plugins/lsp/presets/wgsl-analyzer.nix | 4 +- .../lsp/presets/yaml-language-server.nix | 4 +- modules/plugins/lsp/presets/zls.nix | 4 +- modules/plugins/lsp/presets/zuban.nix | 4 +- 75 files changed, 252 insertions(+), 228 deletions(-) create mode 100644 lib/types/lsp.nix diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md index b0e53071..0271b4bc 100644 --- a/docs/manual/release-notes/rl-0.9.md +++ b/docs/manual/release-notes/rl-0.9.md @@ -270,7 +270,8 @@ [Snoweuph](https://github.com/snoweuph) - Added `vim.lsp.presets.` to contain LSP configurations. This allows for - more flexibility in nvf and reuse of LSPs across languages. + more flexibility in nvf and reuse of LSPs across languages. Dropped + `deprecatedSingleOrListOf` in favor of `listOf` for the affected LSP options. - Fix `vim.lsp.presets.vala-language-server` to be wrapped correctly with `uncrustify`. diff --git a/lib/types/default.nix b/lib/types/default.nix index 66adfbbc..f6c43483 100644 --- a/lib/types/default.nix +++ b/lib/types/default.nix @@ -5,10 +5,12 @@ typesDag = import ./dag.nix {inherit lib;}; typesPlugin = import ./plugins.nix {inherit lib self;}; typesLanguage = import ./languages.nix {inherit lib;}; + typesLsp = import ./lsp.nix {inherit lib;}; customTypes = import ./custom.nix {inherit lib;}; in { inherit (typesDag) dagOf; inherit (typesPlugin) pluginsOpt extraPluginType mkPluginSetupOption luaInline pluginType borderType; inherit (typesLanguage) diagnostics mkGrammarOption; + inherit (typesLsp) mkLspPresetEnableOption; inherit (customTypes) char hexColor mergelessListOf deprecatedSingleOrListOf; } diff --git a/lib/types/lsp.nix b/lib/types/lsp.nix new file mode 100644 index 00000000..d05b8783 --- /dev/null +++ b/lib/types/lsp.nix @@ -0,0 +1,12 @@ +{lib}: let + inherit (lib.options) mkEnableOption; + + mkLspPresetEnableOption = option: display: fileTypes: + mkEnableOption '' + the ${display} Language Server. + Default `filetypes = ${lib.generators.toPretty {} fileTypes}`. + Use {option}`vim.lsp.servers.${option}` for customization + ''; +in { + inherit mkLspPresetEnableOption; +} diff --git a/modules/extra/deprecations.nix b/modules/extra/deprecations.nix index 39c4b96c..91e31404 100644 --- a/modules/extra/deprecations.nix +++ b/modules/extra/deprecations.nix @@ -344,5 +344,11 @@ in { [ (mkRenamedOptionModule ["vim" "treesitter" "foldByDefault"] ["vim" "options" "foldenable"]) ] + + # 2026-13-04 + [ + (mkRenamedOptionModule ["vim" "lsp" "harper-ls" "enable"] ["vim" "lsp" "presets" "harper" "enable"]) + (mkRenamedOptionModule ["vim" "lsp" "harper-ls" "settings"] ["vim" "lsp" "servers" "harper" "settings"]) + ] ]; } diff --git a/modules/plugins/lsp/presets/arduino-language-server.nix b/modules/plugins/lsp/presets/arduino-language-server.nix index 0280f215..af492255 100644 --- a/modules/plugins/lsp/presets/arduino-language-server.nix +++ b/modules/plugins/lsp/presets/arduino-language-server.nix @@ -6,13 +6,13 @@ }: let inherit (lib.meta) getExe getExe'; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.generators) mkLuaInline; cfg = config.vim.lsp.presets.arduino-language-server; in { options.vim.lsp.presets.arduino-language-server = { - enable = mkEnableOption "the Arduino Language Server"; + enable = mkLspPresetEnableOption "arduino-language-server" "Arduino" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/asm-lsp.nix b/modules/plugins/lsp/presets/asm-lsp.nix index 87e0a268..da2d187e 100644 --- a/modules/plugins/lsp/presets/asm-lsp.nix +++ b/modules/plugins/lsp/presets/asm-lsp.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.asm-lsp; in { options.vim.lsp.presets.asm-lsp = { - enable = mkEnableOption "the Assembly Language Server"; + enable = mkLspPresetEnableOption "asm-lsp" "Assembly" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/astro-language-server.nix b/modules/plugins/lsp/presets/astro-language-server.nix index 8dbd9f35..fdf96ccd 100644 --- a/modules/plugins/lsp/presets/astro-language-server.nix +++ b/modules/plugins/lsp/presets/astro-language-server.nix @@ -6,13 +6,13 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.generators) mkLuaInline; cfg = config.vim.lsp.presets.astro-language-server; in { options.vim.lsp.presets.astro-language-server = { - enable = mkEnableOption "the Astro Language Server"; + enable = mkLspPresetEnableOption "astro-language-server" "Astro" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/basedpyright.nix b/modules/plugins/lsp/presets/basedpyright.nix index 4e9b5b07..3ea7b547 100644 --- a/modules/plugins/lsp/presets/basedpyright.nix +++ b/modules/plugins/lsp/presets/basedpyright.nix @@ -6,14 +6,14 @@ }: let inherit (lib.meta) getExe'; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.generators) mkLuaInline; inherit (lib.nvim.dag) entryBefore; cfg = config.vim.lsp.presets.basedpyright; in { options.vim.lsp.presets.basedpyright = { - enable = mkEnableOption "the Based Pyright Language Server"; + enable = mkLspPresetEnableOption "basedpyright" "Based Pyright" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/bash-language-server.nix b/modules/plugins/lsp/presets/bash-language-server.nix index 047e726d..786a1638 100644 --- a/modules/plugins/lsp/presets/bash-language-server.nix +++ b/modules/plugins/lsp/presets/bash-language-server.nix @@ -6,13 +6,13 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.generators) mkLuaInline; cfg = config.vim.lsp.presets.bash-language-server; in { options.vim.lsp.presets.bash-language-server = { - enable = mkEnableOption "the Bash Language Server"; + enable = mkLspPresetEnableOption "bash-language-server" "Bash" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/ccls.nix b/modules/plugins/lsp/presets/ccls.nix index 47c5643d..5f46a2ba 100644 --- a/modules/plugins/lsp/presets/ccls.nix +++ b/modules/plugins/lsp/presets/ccls.nix @@ -6,13 +6,13 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.generators) mkLuaInline; cfg = config.vim.lsp.presets.ccls; in { options.vim.lsp.presets.ccls = { - enable = mkEnableOption "the CC Language Server"; + enable = mkLspPresetEnableOption "ccls" "CC" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/clangd.nix b/modules/plugins/lsp/presets/clangd.nix index 0c7943fa..49bffb04 100644 --- a/modules/plugins/lsp/presets/clangd.nix +++ b/modules/plugins/lsp/presets/clangd.nix @@ -6,13 +6,13 @@ }: let inherit (lib.meta) getExe'; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.generators) mkLuaInline; cfg = config.vim.lsp.presets.clangd; in { options.vim.lsp.presets.clangd = { - enable = mkEnableOption "the Clangd Language Server"; + enable = mkLspPresetEnableOption "clangd" "Clangd" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/clojure-lsp.nix b/modules/plugins/lsp/presets/clojure-lsp.nix index 280a0da6..a51276d5 100644 --- a/modules/plugins/lsp/presets/clojure-lsp.nix +++ b/modules/plugins/lsp/presets/clojure-lsp.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.clojure-lsp; in { options.vim.lsp.presets.clojure-lsp = { - enable = mkEnableOption "the Clojure Language Server"; + enable = mkLspPresetEnableOption "clojure-lsp" "Clojure" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/cue.nix b/modules/plugins/lsp/presets/cue.nix index bf7b73b1..433792f2 100644 --- a/modules/plugins/lsp/presets/cue.nix +++ b/modules/plugins/lsp/presets/cue.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.cue; in { options.vim.lsp.presets.cue = { - enable = mkEnableOption "the CUE Language Server"; + enable = mkLspPresetEnableOption "cue" "Cue" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/dart.nix b/modules/plugins/lsp/presets/dart.nix index e8800abd..f99275ba 100644 --- a/modules/plugins/lsp/presets/dart.nix +++ b/modules/plugins/lsp/presets/dart.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.dart; in { options.vim.lsp.presets.dart = { - enable = mkEnableOption "the Dart Language Server"; + enable = mkLspPresetEnableOption "dart" "Dart" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/deno.nix b/modules/plugins/lsp/presets/deno.nix index 92aa16b6..637d219d 100644 --- a/modules/plugins/lsp/presets/deno.nix +++ b/modules/plugins/lsp/presets/deno.nix @@ -6,13 +6,13 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.generators) mkLuaInline; cfg = config.vim.lsp.presets.deno; in { options.vim.lsp.presets.deno = { - enable = mkEnableOption "the Deno Language Server"; + enable = mkLspPresetEnableOption "deno" "Deno" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/elixir-ls.nix b/modules/plugins/lsp/presets/elixir-ls.nix index e1749f25..f4b16268 100644 --- a/modules/plugins/lsp/presets/elixir-ls.nix +++ b/modules/plugins/lsp/presets/elixir-ls.nix @@ -6,13 +6,13 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.generators) mkLuaInline; cfg = config.vim.lsp.presets.elixir-ls; in { options.vim.lsp.presets.elixir-ls = { - enable = mkEnableOption "the Elixir Language Server"; + enable = mkLspPresetEnableOption "elixir-ls" "Elixir" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/elm-language-server.nix b/modules/plugins/lsp/presets/elm-language-server.nix index db7f82d9..ee3c97fb 100644 --- a/modules/plugins/lsp/presets/elm-language-server.nix +++ b/modules/plugins/lsp/presets/elm-language-server.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.elm-language-server; in { options.vim.lsp.presets.elm-language-server = { - enable = mkEnableOption "the Elm Language Server"; + enable = mkLspPresetEnableOption "elm-language-server" "Elm" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/emmet-ls.nix b/modules/plugins/lsp/presets/emmet-ls.nix index 4886115f..42e6fd1f 100644 --- a/modules/plugins/lsp/presets/emmet-ls.nix +++ b/modules/plugins/lsp/presets/emmet-ls.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.emmet-ls; in { options.vim.lsp.presets.emmet-ls = { - enable = mkEnableOption "the Emmet Language Server"; + enable = mkLspPresetEnableOption "emmet-ls" "Emmet" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/fsautocomplete.nix b/modules/plugins/lsp/presets/fsautocomplete.nix index 8fcd5e39..d5b95de1 100644 --- a/modules/plugins/lsp/presets/fsautocomplete.nix +++ b/modules/plugins/lsp/presets/fsautocomplete.nix @@ -6,13 +6,13 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.generators) mkLuaInline; cfg = config.vim.lsp.presets.fsautocomplete; in { options.vim.lsp.presets.fsautocomplete = { - enable = mkEnableOption "the F# Autocomplete Language Server"; + enable = mkLspPresetEnableOption "fsautocomplete" "F# Autocomplete" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/gleam.nix b/modules/plugins/lsp/presets/gleam.nix index a98c313c..46b21e87 100644 --- a/modules/plugins/lsp/presets/gleam.nix +++ b/modules/plugins/lsp/presets/gleam.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.gleam; in { options.vim.lsp.presets.gleam = { - enable = mkEnableOption "the Gleam Language Server"; + enable = mkLspPresetEnableOption "gleam" "Gleam" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/glsl_analyzer.nix b/modules/plugins/lsp/presets/glsl_analyzer.nix index f548f792..9b7798de 100644 --- a/modules/plugins/lsp/presets/glsl_analyzer.nix +++ b/modules/plugins/lsp/presets/glsl_analyzer.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.glsl_analyzer; in { options.vim.lsp.presets.glsl_analyzer = { - enable = mkEnableOption "the GLSL-Analyzer Language Server"; + enable = mkLspPresetEnableOption "glsl_analyzer" "GLSL Analyzer" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/gopls.nix b/modules/plugins/lsp/presets/gopls.nix index 3a95738f..9432dcd8 100644 --- a/modules/plugins/lsp/presets/gopls.nix +++ b/modules/plugins/lsp/presets/gopls.nix @@ -6,13 +6,13 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.generators) mkLuaInline; cfg = config.vim.lsp.presets.gopls; in { options.vim.lsp.presets.gopls = { - enable = mkEnableOption "the official Go Language Server"; + enable = mkLspPresetEnableOption "gopls" "Go" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/harper.nix b/modules/plugins/lsp/presets/harper.nix index 3739e937..9fce2230 100644 --- a/modules/plugins/lsp/presets/harper.nix +++ b/modules/plugins/lsp/presets/harper.nix @@ -6,12 +6,41 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.harper; + filetypes = [ + # + "asciidoc" + "c" + "clojure" + "cmake" + "cpp" + "cs" + "daml" + "dart" + "gitcommit" + "go" + "haskell" + "html" + "ink" + "java" + "javascript" + "javascriptreact" + "kotlin" + "lhaskell" + "lua" + "mail" + "markdown" + "nix" + "php" + "python" + "ruby" + "rust" + ]; in { options.vim.lsp.presets.harper = { - enable = mkEnableOption "the Harper grammar checking LSP"; + enable = mkLspPresetEnableOption "harper" "Harper" filetypes; }; config = mkIf cfg.enable { @@ -19,35 +48,7 @@ in { enable = true; cmd = [(getExe pkgs.harper) "--stdio"]; root_markers = [".git" ".harper-dictionary.txt"]; - filetypes = [ - # - "asciidoc" - "c" - "clojure" - "cmake" - "cpp" - "cs" - "daml" - "dart" - "gitcommit" - "go" - "haskell" - "html" - "ink" - "java" - "javascript" - "javascriptreact" - "kotlin" - "lhaskell" - "lua" - "mail" - "markdown" - "nix" - "php" - "python" - "ruby" - "rust" - ]; + inherit filetypes; }; }; } diff --git a/modules/plugins/lsp/presets/helm-ls.nix b/modules/plugins/lsp/presets/helm-ls.nix index 735d7266..e0398f8e 100644 --- a/modules/plugins/lsp/presets/helm-ls.nix +++ b/modules/plugins/lsp/presets/helm-ls.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.helm-ls; in { options.vim.lsp.presets.helm-ls = { - enable = mkEnableOption "the Helm Language Server"; + enable = mkLspPresetEnableOption "helm-ls" "Helm" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/intelephense.nix b/modules/plugins/lsp/presets/intelephense.nix index da0edbbb..a15c039e 100644 --- a/modules/plugins/lsp/presets/intelephense.nix +++ b/modules/plugins/lsp/presets/intelephense.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.intelephense; in { options.vim.lsp.presets.intelephense = { - enable = mkEnableOption "the Intelephense Language Server"; + enable = mkLspPresetEnableOption "intelephense" "Intelephense" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/jdt-language-server.nix b/modules/plugins/lsp/presets/jdt-language-server.nix index fc5e2900..c00125c9 100644 --- a/modules/plugins/lsp/presets/jdt-language-server.nix +++ b/modules/plugins/lsp/presets/jdt-language-server.nix @@ -6,14 +6,14 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.generators) mkLuaInline; inherit (lib.nvim.dag) entryBefore; cfg = config.vim.lsp.presets.jdt-language-server; in { options.vim.lsp.presets.jdt-language-server = { - enable = mkEnableOption "the Eclipse JDT Language Server"; + enable = mkLspPresetEnableOption "jdt-language-server" "Eclipse JDT" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/jinja-lsp.nix b/modules/plugins/lsp/presets/jinja-lsp.nix index 5d1ce099..a60ea7ef 100644 --- a/modules/plugins/lsp/presets/jinja-lsp.nix +++ b/modules/plugins/lsp/presets/jinja-lsp.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.jinja-lsp; in { options.vim.lsp.presets.jinja-lsp = { - enable = mkEnableOption "the Jinja Language Server"; + enable = mkLspPresetEnableOption "jinja-lsp" "Jinja" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/jq-lsp.nix b/modules/plugins/lsp/presets/jq-lsp.nix index f886f9c6..2f695a68 100644 --- a/modules/plugins/lsp/presets/jq-lsp.nix +++ b/modules/plugins/lsp/presets/jq-lsp.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.jq-lsp; in { options.vim.lsp.presets.jq-lsp = { - enable = mkEnableOption "the JQ Language Server"; + enable = mkLspPresetEnableOption "jq-lsp" "JQ" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/julia-languageserver.nix b/modules/plugins/lsp/presets/julia-languageserver.nix index 0fcd7440..61b5d290 100644 --- a/modules/plugins/lsp/presets/julia-languageserver.nix +++ b/modules/plugins/lsp/presets/julia-languageserver.nix @@ -6,14 +6,14 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.generators) mkLuaInline; inherit (lib.nvim.dag) entryBefore; cfg = config.vim.lsp.presets.julia-languageserver; in { options.vim.lsp.presets.julia-languageserver = { - enable = mkEnableOption "the Julia Language Server"; + enable = mkLspPresetEnableOption "julia-languageserver" "Julia" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/just-lsp.nix b/modules/plugins/lsp/presets/just-lsp.nix index 509c22d9..acb48c80 100644 --- a/modules/plugins/lsp/presets/just-lsp.nix +++ b/modules/plugins/lsp/presets/just-lsp.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.just-lsp; in { options.vim.lsp.presets.just-lsp = { - enable = mkEnableOption "the Just Language Server"; + enable = mkLspPresetEnableOption "just-lsp" "Just" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/kotlin-language-server.nix b/modules/plugins/lsp/presets/kotlin-language-server.nix index 9d71f316..0c68b3bb 100644 --- a/modules/plugins/lsp/presets/kotlin-language-server.nix +++ b/modules/plugins/lsp/presets/kotlin-language-server.nix @@ -6,13 +6,13 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.generators) mkLuaInline; cfg = config.vim.lsp.presets.kotlin-language-server; in { options.vim.lsp.presets.kotlin-language-server = { - enable = mkEnableOption "the Kotlin Language Server"; + enable = mkLspPresetEnableOption "kotlin-language-server" "Kotlin" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/lemminx.nix b/modules/plugins/lsp/presets/lemminx.nix index 4d6e9e68..b8cbf0bd 100644 --- a/modules/plugins/lsp/presets/lemminx.nix +++ b/modules/plugins/lsp/presets/lemminx.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.lemminx; in { options.vim.lsp.presets.lemminx = { - enable = mkEnableOption "Lemminx Language Server"; + enable = mkLspPresetEnableOption "lemminx" "Lemminx" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/lua-language-server.nix b/modules/plugins/lsp/presets/lua-language-server.nix index 5c89ad26..f5e13447 100644 --- a/modules/plugins/lsp/presets/lua-language-server.nix +++ b/modules/plugins/lsp/presets/lua-language-server.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.lua-language-server; in { options.vim.lsp.presets.lua-language-server = { - enable = mkEnableOption "the Lua Language Server"; + enable = mkLspPresetEnableOption "lua-language-server" "Lua" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/markdown-oxide.nix b/modules/plugins/lsp/presets/markdown-oxide.nix index 96af3cda..8eadd99b 100644 --- a/modules/plugins/lsp/presets/markdown-oxide.nix +++ b/modules/plugins/lsp/presets/markdown-oxide.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.markdown-oxide; in { options.vim.lsp.presets.markdown-oxide = { - enable = mkEnableOption "the Markdown-Oxide Language Server"; + enable = mkLspPresetEnableOption "markdown-oxide" "Markdown Oxide" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/marksman.nix b/modules/plugins/lsp/presets/marksman.nix index 5bc296dc..ce40190e 100644 --- a/modules/plugins/lsp/presets/marksman.nix +++ b/modules/plugins/lsp/presets/marksman.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.marksman; in { options.vim.lsp.presets.marksman = { - enable = mkEnableOption "the Marksman Language Server"; + enable = mkLspPresetEnableOption "marksman" "Marksman" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/neocmakelsp.nix b/modules/plugins/lsp/presets/neocmakelsp.nix index 31e64769..730857ce 100644 --- a/modules/plugins/lsp/presets/neocmakelsp.nix +++ b/modules/plugins/lsp/presets/neocmakelsp.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.neocmakelsp; in { options.vim.lsp.presets.neocmakelsp = { - enable = mkEnableOption "the Neo CMake Language Server"; + enable = mkLspPresetEnableOption "neocmakelsp" "NeoCmake" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/nil.nix b/modules/plugins/lsp/presets/nil.nix index e59e24fd..f27adedb 100644 --- a/modules/plugins/lsp/presets/nil.nix +++ b/modules/plugins/lsp/presets/nil.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.nil; in { options.vim.lsp.presets.nil = { - enable = mkEnableOption "the Nil Nix Language Server"; + enable = mkLspPresetEnableOption "nil" "Nil" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/nimlsp.nix b/modules/plugins/lsp/presets/nimlsp.nix index e52e9cee..f8f376f8 100644 --- a/modules/plugins/lsp/presets/nimlsp.nix +++ b/modules/plugins/lsp/presets/nimlsp.nix @@ -6,13 +6,13 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.generators) mkLuaInline; cfg = config.vim.lsp.presets.nimlsp; in { options.vim.lsp.presets.nimlsp = { - enable = mkEnableOption "the Nim Language Server"; + enable = mkLspPresetEnableOption "nimlsp" "Nim" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/nixd.nix b/modules/plugins/lsp/presets/nixd.nix index 6f1326be..a8202c61 100644 --- a/modules/plugins/lsp/presets/nixd.nix +++ b/modules/plugins/lsp/presets/nixd.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.nixd; in { options.vim.lsp.presets.nixd = { - enable = mkEnableOption "the NixD Language Server"; + enable = mkLspPresetEnableOption "nixd" "Nixd" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/nushell.nix b/modules/plugins/lsp/presets/nushell.nix index 1f253825..485d2990 100644 --- a/modules/plugins/lsp/presets/nushell.nix +++ b/modules/plugins/lsp/presets/nushell.nix @@ -6,13 +6,13 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.generators) mkLuaInline; cfg = config.vim.lsp.presets.nushell; in { options.vim.lsp.presets.nushell = { - enable = mkEnableOption "the NuShell Language Server"; + enable = mkLspPresetEnableOption "nushell" "NuShell" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/ocaml-lsp.nix b/modules/plugins/lsp/presets/ocaml-lsp.nix index 0e9b0952..a98ba8dd 100644 --- a/modules/plugins/lsp/presets/ocaml-lsp.nix +++ b/modules/plugins/lsp/presets/ocaml-lsp.nix @@ -6,13 +6,13 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.generators) mkLuaInline; cfg = config.vim.lsp.presets.ocaml-lsp; in { options.vim.lsp.presets.ocaml-lsp = { - enable = mkEnableOption "the OCaml Language Server"; + enable = mkLspPresetEnableOption "ocaml-lsp" "OCaml" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/ols.nix b/modules/plugins/lsp/presets/ols.nix index 9eb4e3ad..0f2dc4d0 100644 --- a/modules/plugins/lsp/presets/ols.nix +++ b/modules/plugins/lsp/presets/ols.nix @@ -6,13 +6,13 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.generators) mkLuaInline; cfg = config.vim.lsp.presets.ols; in { options.vim.lsp.presets.ols = { - enable = mkEnableOption "the Odin Language Server"; + enable = mkLspPresetEnableOption "ols" "Odin" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/openscad-lsp.nix b/modules/plugins/lsp/presets/openscad-lsp.nix index d271c8d3..78392f3e 100644 --- a/modules/plugins/lsp/presets/openscad-lsp.nix +++ b/modules/plugins/lsp/presets/openscad-lsp.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.openscad-lsp; in { options.vim.lsp.presets.openscad-lsp = { - enable = mkEnableOption "the Open SCAD Language Server"; + enable = mkLspPresetEnableOption "openscad-lsp" "Open SCAD" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/phan.nix b/modules/plugins/lsp/presets/phan.nix index 281da772..c259d4fb 100644 --- a/modules/plugins/lsp/presets/phan.nix +++ b/modules/plugins/lsp/presets/phan.nix @@ -6,13 +6,13 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.generators) mkLuaInline; cfg = config.vim.lsp.presets.phan; in { options.vim.lsp.presets.phan = { - enable = mkEnableOption "the Phan Language Server"; + enable = mkLspPresetEnableOption "phan" "Phan" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/phpactor.nix b/modules/plugins/lsp/presets/phpactor.nix index 57e2ee24..3bcd062f 100644 --- a/modules/plugins/lsp/presets/phpactor.nix +++ b/modules/plugins/lsp/presets/phpactor.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.phpactor; in { options.vim.lsp.presets.phpactor = { - enable = mkEnableOption "the PHPActor Language Server"; + enable = mkLspPresetEnableOption "phpactor" "PHPActor" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/pyrefly.nix b/modules/plugins/lsp/presets/pyrefly.nix index 18db921a..30623c34 100644 --- a/modules/plugins/lsp/presets/pyrefly.nix +++ b/modules/plugins/lsp/presets/pyrefly.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.pyrefly; in { options.vim.lsp.presets.pyrefly = { - enable = mkEnableOption "the Pyrefly Language Server"; + enable = mkLspPresetEnableOption "pyrefly" "Pyrefly" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/pyright.nix b/modules/plugins/lsp/presets/pyright.nix index b7367bc2..69122718 100644 --- a/modules/plugins/lsp/presets/pyright.nix +++ b/modules/plugins/lsp/presets/pyright.nix @@ -6,14 +6,14 @@ }: let inherit (lib.meta) getExe'; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.generators) mkLuaInline; inherit (lib.nvim.dag) entryBefore; cfg = config.vim.lsp.presets.pyright; in { options.vim.lsp.presets.pyright = { - enable = mkEnableOption "the Pyright Language Server"; + enable = mkLspPresetEnableOption "pyright" "Pyright" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/python-lsp-server.nix b/modules/plugins/lsp/presets/python-lsp-server.nix index 7408a7f3..2d6a41de 100644 --- a/modules/plugins/lsp/presets/python-lsp-server.nix +++ b/modules/plugins/lsp/presets/python-lsp-server.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.python-lsp-server; in { options.vim.lsp.presets.python-lsp-server = { - enable = mkEnableOption "the Python Language Server"; + enable = mkLspPresetEnableOption "python-lsp-server" "Python" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/qmlls.nix b/modules/plugins/lsp/presets/qmlls.nix index 7a3af64f..9c39b9e6 100644 --- a/modules/plugins/lsp/presets/qmlls.nix +++ b/modules/plugins/lsp/presets/qmlls.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe'; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.qmlls; in { options.vim.lsp.presets.qmlls = { - enable = mkEnableOption "the QML Language Server"; + enable = mkLspPresetEnableOption "qmlls" "QML" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/r-languageserver.nix b/modules/plugins/lsp/presets/r-languageserver.nix index 9e83eecd..ed126f05 100644 --- a/modules/plugins/lsp/presets/r-languageserver.nix +++ b/modules/plugins/lsp/presets/r-languageserver.nix @@ -6,13 +6,13 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.generators) mkLuaInline; cfg = config.vim.lsp.presets.r-languageserver; in { options.vim.lsp.presets.r-languageserver = { - enable = mkEnableOption "the R Language Server"; + enable = mkLspPresetEnableOption "r-languageserver" "R" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/ruby-lsp.nix b/modules/plugins/lsp/presets/ruby-lsp.nix index 2b5f633b..eb9ffb1d 100644 --- a/modules/plugins/lsp/presets/ruby-lsp.nix +++ b/modules/plugins/lsp/presets/ruby-lsp.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.ruby-lsp; in { options.vim.lsp.presets.ruby-lsp = { - enable = mkEnableOption "the Ruby Language Server"; + enable = mkLspPresetEnableOption "ruby-lsp" "Ruby" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/ruff.nix b/modules/plugins/lsp/presets/ruff.nix index 28775b7b..aadabc26 100644 --- a/modules/plugins/lsp/presets/ruff.nix +++ b/modules/plugins/lsp/presets/ruff.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.ruff; in { options.vim.lsp.presets.ruff = { - enable = mkEnableOption "the Ruff Python Language Server"; + enable = mkLspPresetEnableOption "ruff" "Ruff" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/rumdl.nix b/modules/plugins/lsp/presets/rumdl.nix index c616cd94..3486d540 100644 --- a/modules/plugins/lsp/presets/rumdl.nix +++ b/modules/plugins/lsp/presets/rumdl.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.rumdl; in { options.vim.lsp.presets.rumdl = { - enable = mkEnableOption "the Rumdl Language Server"; + enable = mkLspPresetEnableOption "rumdl" "Rumdl" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/solargraph.nix b/modules/plugins/lsp/presets/solargraph.nix index fcd64e4a..131cbfc2 100644 --- a/modules/plugins/lsp/presets/solargraph.nix +++ b/modules/plugins/lsp/presets/solargraph.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.solargraph; in { options.vim.lsp.presets.solargraph = { - enable = mkEnableOption "the Ruby Solargraph Language Server"; + enable = mkLspPresetEnableOption "solargraph" "Solargraph" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/sqls.nix b/modules/plugins/lsp/presets/sqls.nix index 02a411b9..b15df552 100644 --- a/modules/plugins/lsp/presets/sqls.nix +++ b/modules/plugins/lsp/presets/sqls.nix @@ -6,13 +6,13 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.generators) mkLuaInline; cfg = config.vim.lsp.presets.sqls; in { options.vim.lsp.presets.sqls = { - enable = mkEnableOption "the SQL Language Server"; + enable = mkLspPresetEnableOption "sqls" "SQL" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/superhtml.nix b/modules/plugins/lsp/presets/superhtml.nix index 376c8ddd..e32907ef 100644 --- a/modules/plugins/lsp/presets/superhtml.nix +++ b/modules/plugins/lsp/presets/superhtml.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.superhtml; in { options.vim.lsp.presets.superhtml = { - enable = mkEnableOption "the SuperHTML Language Server"; + enable = mkLspPresetEnableOption "superhtml" "SuperHTML" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/svelte-language-server.nix b/modules/plugins/lsp/presets/svelte-language-server.nix index 423378c4..2ba922af 100644 --- a/modules/plugins/lsp/presets/svelte-language-server.nix +++ b/modules/plugins/lsp/presets/svelte-language-server.nix @@ -6,13 +6,13 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.generators) mkLuaInline; cfg = config.vim.lsp.presets.svelte-language-server; in { options.vim.lsp.presets.svelte-language-server = { - enable = mkEnableOption "the Svelete Language Server"; + enable = mkLspPresetEnableOption "svelte-language-server" "Svelte" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/tailwindcss-language-server.nix b/modules/plugins/lsp/presets/tailwindcss-language-server.nix index e2dc37de..846a063d 100644 --- a/modules/plugins/lsp/presets/tailwindcss-language-server.nix +++ b/modules/plugins/lsp/presets/tailwindcss-language-server.nix @@ -6,13 +6,70 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.generators) mkLuaInline; cfg = config.vim.lsp.presets.tailwindcss-language-server; + + filetypes = [ + # html + "aspnetcorerazor" + "astro" + "astro-markdown" + "blade" + "clojure" + "django-html" + "htmldjango" + "edge" + "eelixir" + "elixir" + "ejs" + "erb" + "eruby" + "gohtml" + "gohtmltmpl" + "haml" + "handlebars" + "hbs" + "html" + "htmlangular" + "html-eex" + "heex" + "jade" + "leaf" + "liquid" + "markdown" + "mdx" + "mustache" + "njk" + "nunjucks" + "php" + "razor" + "slim" + "twig" + # css + "css" + "less" + "postcss" + "sass" + "scss" + "stylus" + "sugarss" + # js + "javascript" + "javascriptreact" + "reason" + "rescript" + "typescript" + "typescriptreact" + # mixed + "vue" + "svelte" + "templ" + ]; in { options.vim.lsp.presets.tailwindcss-language-server = { - enable = mkEnableOption "the Tailwind CSS Language Server"; + enable = mkLspPresetEnableOption "tailwindcss-language-server" "Tailwind CSS" filetypes; }; config = mkIf cfg.enable { @@ -20,62 +77,7 @@ in { enable = true; cmd = [(getExe pkgs.tailwindcss-language-server) "--stdio"]; root_markers = [".git"]; - filetypes = [ - # html - "aspnetcorerazor" - "astro" - "astro-markdown" - "blade" - "clojure" - "django-html" - "htmldjango" - "edge" - "eelixir" - "elixir" - "ejs" - "erb" - "eruby" - "gohtml" - "gohtmltmpl" - "haml" - "handlebars" - "hbs" - "html" - "htmlangular" - "html-eex" - "heex" - "jade" - "leaf" - "liquid" - "markdown" - "mdx" - "mustache" - "njk" - "nunjucks" - "php" - "razor" - "slim" - "twig" - # css - "css" - "less" - "postcss" - "sass" - "scss" - "stylus" - "sugarss" - # js - "javascript" - "javascriptreact" - "reason" - "rescript" - "typescript" - "typescriptreact" - # mixed - "vue" - "svelte" - "templ" - ]; + inherit filetypes; settings = { tailwindCSS = { validate = true; diff --git a/modules/plugins/lsp/presets/taplo.nix b/modules/plugins/lsp/presets/taplo.nix index 6cd0aed3..9908b9c6 100644 --- a/modules/plugins/lsp/presets/taplo.nix +++ b/modules/plugins/lsp/presets/taplo.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.taplo; in { options.vim.lsp.presets.taplo = { - enable = mkEnableOption "the Taplo Language Server"; + enable = mkLspPresetEnableOption "taplo" "Taplo" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/terraform-ls.nix b/modules/plugins/lsp/presets/terraform-ls.nix index 26c4c54b..d2814cf7 100644 --- a/modules/plugins/lsp/presets/terraform-ls.nix +++ b/modules/plugins/lsp/presets/terraform-ls.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.terraform-ls; in { options.vim.lsp.presets.terraform-ls = { - enable = mkEnableOption "the Terraform Language Server"; + enable = mkLspPresetEnableOption "terrraform-ls" "Terraform" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/texlab.nix b/modules/plugins/lsp/presets/texlab.nix index 13c6ddf4..5739253e 100644 --- a/modules/plugins/lsp/presets/texlab.nix +++ b/modules/plugins/lsp/presets/texlab.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.texlab; in { options.vim.lsp.presets.texlab = { - enable = mkEnableOption "the TeXLab Language Server"; + enable = mkLspPresetEnableOption "texlab" "TeXLab" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/tinymist.nix b/modules/plugins/lsp/presets/tinymist.nix index e261cd32..8f8684f2 100644 --- a/modules/plugins/lsp/presets/tinymist.nix +++ b/modules/plugins/lsp/presets/tinymist.nix @@ -6,13 +6,13 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.generators) mkLuaInline; cfg = config.vim.lsp.presets.tinymist; in { options.vim.lsp.presets.tinymist = { - enable = mkEnableOption "Tinymist Language Server"; + enable = mkLspPresetEnableOption "tinymist" "Tinymist" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/tofu-ls.nix b/modules/plugins/lsp/presets/tofu-ls.nix index 0b3d25df..0532471e 100644 --- a/modules/plugins/lsp/presets/tofu-ls.nix +++ b/modules/plugins/lsp/presets/tofu-ls.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.tofu-ls; in { options.vim.lsp.presets.tofu-ls = { - enable = mkEnableOption "the OpenTofu Language Server"; + enable = mkLspPresetEnableOption "tofu-ls" "OpenTofu" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/tombi.nix b/modules/plugins/lsp/presets/tombi.nix index 189ab6d6..868abeb6 100644 --- a/modules/plugins/lsp/presets/tombi.nix +++ b/modules/plugins/lsp/presets/tombi.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.tombi; in { options.vim.lsp.presets.tombi = { - enable = mkEnableOption "the Tombi Language Server (AI Slop)"; + enable = mkLspPresetEnableOption "tombi" "Tombi (AI Slop)" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/twig-language-server.nix b/modules/plugins/lsp/presets/twig-language-server.nix index 6a2c71d3..1668310c 100644 --- a/modules/plugins/lsp/presets/twig-language-server.nix +++ b/modules/plugins/lsp/presets/twig-language-server.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.twig-language-server; in { options.vim.lsp.presets.twig-language-server = { - enable = mkEnableOption "Twig Language Server"; + enable = mkLspPresetEnableOption "twig-language-server" "Twig" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/ty.nix b/modules/plugins/lsp/presets/ty.nix index 869fcb3c..8468dde9 100644 --- a/modules/plugins/lsp/presets/ty.nix +++ b/modules/plugins/lsp/presets/ty.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.ty; in { options.vim.lsp.presets.ty = { - enable = mkEnableOption "the ty Python Language Server"; + enable = mkLspPresetEnableOption "ty" "ty" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/typescript-go.nix b/modules/plugins/lsp/presets/typescript-go.nix index 9be995f8..121fad29 100644 --- a/modules/plugins/lsp/presets/typescript-go.nix +++ b/modules/plugins/lsp/presets/typescript-go.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.typescript-go; in { options.vim.lsp.presets.typescript-go = { - enable = mkEnableOption "the experimental Typescript Go Language Server"; + enable = mkLspPresetEnableOption "typescript-go" "experimental TypeScript Go" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/typescript-language-server.nix b/modules/plugins/lsp/presets/typescript-language-server.nix index bf1dc1f4..efd95cc0 100644 --- a/modules/plugins/lsp/presets/typescript-language-server.nix +++ b/modules/plugins/lsp/presets/typescript-language-server.nix @@ -6,13 +6,13 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; inherit (lib.generators) mkLuaInline; cfg = config.vim.lsp.presets.typescript-language-server; in { options.vim.lsp.presets.typescript-language-server = { - enable = mkEnableOption "the Typescript Language Server"; + enable = mkLspPresetEnableOption "typescript-language-server" "TypeScript" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/vala-language-server.nix b/modules/plugins/lsp/presets/vala-language-server.nix index 0fe5b96e..f7dbc600 100644 --- a/modules/plugins/lsp/presets/vala-language-server.nix +++ b/modules/plugins/lsp/presets/vala-language-server.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.vala-language-server; in { options.vim.lsp.presets.vala-language-server = { - enable = mkEnableOption "the Vala Language Server"; + enable = mkLspPresetEnableOption "vala-language-server" "Vala" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/vscode-css-language-server.nix b/modules/plugins/lsp/presets/vscode-css-language-server.nix index 100d363b..39196aa8 100644 --- a/modules/plugins/lsp/presets/vscode-css-language-server.nix +++ b/modules/plugins/lsp/presets/vscode-css-language-server.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe'; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.vscode-css-language-server; in { options.vim.lsp.presets.vscode-css-language-server = { - enable = mkEnableOption "the VSCode CSS Language Server"; + enable = mkLspPresetEnableOption "vscode-css-language-server" "VSCode CSS" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/vscode-json-language-server.nix b/modules/plugins/lsp/presets/vscode-json-language-server.nix index bcb98291..9a3ff2dd 100644 --- a/modules/plugins/lsp/presets/vscode-json-language-server.nix +++ b/modules/plugins/lsp/presets/vscode-json-language-server.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe'; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.vscode-json-language-server; in { options.vim.lsp.presets.vscode-json-language-server = { - enable = mkEnableOption "the VSCode JSON Language Server"; + enable = mkLspPresetEnableOption "vscode-json-language-server" "VSCode JSON" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/wgsl-analyzer.nix b/modules/plugins/lsp/presets/wgsl-analyzer.nix index 53a3017e..523212c4 100644 --- a/modules/plugins/lsp/presets/wgsl-analyzer.nix +++ b/modules/plugins/lsp/presets/wgsl-analyzer.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.wgsl-analyzer; in { options.vim.lsp.presets.wgsl-analyzer = { - enable = mkEnableOption "the WGSL-Analyzer Language Server"; + enable = mkLspPresetEnableOption "wgsl-analyzer" "WGSL Analyzer" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/yaml-language-server.nix b/modules/plugins/lsp/presets/yaml-language-server.nix index 4ec64603..58204a21 100644 --- a/modules/plugins/lsp/presets/yaml-language-server.nix +++ b/modules/plugins/lsp/presets/yaml-language-server.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.yaml-language-server; in { options.vim.lsp.presets.yaml-language-server = { - enable = mkEnableOption "the YAML Language Server"; + enable = mkLspPresetEnableOption "yaml-language-server" "YAML" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/zls.nix b/modules/plugins/lsp/presets/zls.nix index 9d540928..a9b4d92b 100644 --- a/modules/plugins/lsp/presets/zls.nix +++ b/modules/plugins/lsp/presets/zls.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.zls; in { options.vim.lsp.presets.zls = { - enable = mkEnableOption "the Zig Language Server"; + enable = mkLspPresetEnableOption "zls" "Zig" []; }; config = mkIf cfg.enable { diff --git a/modules/plugins/lsp/presets/zuban.nix b/modules/plugins/lsp/presets/zuban.nix index 3713d912..b7cc7f2d 100644 --- a/modules/plugins/lsp/presets/zuban.nix +++ b/modules/plugins/lsp/presets/zuban.nix @@ -6,12 +6,12 @@ }: let inherit (lib.meta) getExe; inherit (lib.modules) mkIf; - inherit (lib.options) mkEnableOption; + inherit (lib.nvim.types) mkLspPresetEnableOption; cfg = config.vim.lsp.presets.zuban; in { options.vim.lsp.presets.zuban = { - enable = mkEnableOption "the Zuban Python Language Server"; + enable = mkLspPresetEnableOption "zuban" "Zuban" []; }; config = mkIf cfg.enable {