diff --git a/modules/plugins/languages/asm.nix b/modules/plugins/languages/asm.nix index 2a5a2843..c0887d77 100644 --- a/modules/plugins/languages/asm.nix +++ b/modules/plugins/languages/asm.nix @@ -34,9 +34,9 @@ in { lsp = { enable = mkEnableOption "Assembly LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "Assembly LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "Assembly LSP server to use"; }; }; }; diff --git a/modules/plugins/languages/astro.nix b/modules/plugins/languages/astro.nix index f2c8517a..35de328b 100644 --- a/modules/plugins/languages/astro.nix +++ b/modules/plugins/languages/astro.nix @@ -91,9 +91,9 @@ in { lsp = { enable = mkEnableOption "Astro LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "Astro LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "Astro LSP server to use"; }; }; @@ -101,15 +101,15 @@ in { enable = mkEnableOption "Astro formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { - description = "Astro formatter to use"; type = enum (attrNames formats); default = defaultFormat; + description = "Astro formatter to use"; }; package = mkOption { - description = "Astro formatter package"; type = package; default = formats.${cfg.format.type}.package; + description = "Astro formatter package"; }; }; diff --git a/modules/plugins/languages/bash.nix b/modules/plugins/languages/bash.nix index e0e28bd7..e34edccb 100644 --- a/modules/plugins/languages/bash.nix +++ b/modules/plugins/languages/bash.nix @@ -57,28 +57,28 @@ in { lsp = { enable = mkEnableOption "Bash LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "Bash LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "Bash LSP server to use"; }; }; format = { enable = mkOption { - description = "Enable Bash formatting"; type = bool; default = config.vim.languages.enableFormat; + description = "Enable Bash formatting"; }; type = mkOption { - description = "Bash formatter to use"; type = enum (attrNames formats); default = defaultFormat; + description = "Bash formatter to use"; }; package = mkOption { - description = "Bash formatter package"; type = package; default = formats.${cfg.format.type}.package; + description = "Bash formatter package"; }; }; diff --git a/modules/plugins/languages/clojure.nix b/modules/plugins/languages/clojure.nix index 31062ba7..442df2b7 100644 --- a/modules/plugins/languages/clojure.nix +++ b/modules/plugins/languages/clojure.nix @@ -37,9 +37,9 @@ in { lsp = { enable = mkEnableOption "Clojure LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "Clojure LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "Clojure LSP server to use"; }; }; }; diff --git a/modules/plugins/languages/dart.nix b/modules/plugins/languages/dart.nix index 61f52abb..de267e7c 100644 --- a/modules/plugins/languages/dart.nix +++ b/modules/plugins/languages/dart.nix @@ -54,9 +54,9 @@ in { lsp = { enable = mkEnableOption "Dart LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "Dart LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "Dart LSP server to use"; }; }; diff --git a/modules/plugins/languages/elixir.nix b/modules/plugins/languages/elixir.nix index 2164b469..5204c96b 100644 --- a/modules/plugins/languages/elixir.nix +++ b/modules/plugins/languages/elixir.nix @@ -63,9 +63,9 @@ in { lsp = { enable = mkEnableOption "Elixir LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "Elixir LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "Elixir LSP server to use"; }; }; @@ -73,15 +73,15 @@ in { enable = mkEnableOption "Elixir formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { - description = "Elixir formatter to use"; type = enum (attrNames formats); default = defaultFormat; + description = "Elixir formatter to use"; }; package = mkOption { - description = "Elixir formatter package"; type = package; default = formats.${cfg.format.type}.package; + description = "Elixir formatter package"; }; }; diff --git a/modules/plugins/languages/gleam.nix b/modules/plugins/languages/gleam.nix index 5f4e4b4f..26a001eb 100644 --- a/modules/plugins/languages/gleam.nix +++ b/modules/plugins/languages/gleam.nix @@ -37,9 +37,9 @@ in { lsp = { enable = mkEnableOption "Gleam LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "Gleam LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "Gleam LSP server to use"; }; }; }; diff --git a/modules/plugins/languages/haskell.nix b/modules/plugins/languages/haskell.nix index 0fd39b5e..476c2979 100644 --- a/modules/plugins/languages/haskell.nix +++ b/modules/plugins/languages/haskell.nix @@ -77,18 +77,18 @@ in { lsp = { enable = mkEnableOption "Haskell LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "Haskell LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "Haskell LSP server to use"; }; }; dap = { enable = mkEnableOption "DAP support for Haskell" // {default = config.vim.languages.enableDAP;}; package = mkOption { - description = "Haskell DAP package or command to run the Haskell DAP"; default = haskellPackages.haskell-debug-adapter; type = either package (listOf str); + description = "Haskell DAP package or command to run the Haskell DAP"; }; }; }; diff --git a/modules/plugins/languages/hcl.nix b/modules/plugins/languages/hcl.nix index a98498ee..ca00f600 100644 --- a/modules/plugins/languages/hcl.nix +++ b/modules/plugins/languages/hcl.nix @@ -42,9 +42,9 @@ in { lsp = { enable = mkEnableOption "HCL LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "HCL LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "HCL LSP server to use"; }; }; diff --git a/modules/plugins/languages/helm.nix b/modules/plugins/languages/helm.nix index a339a3a0..f5fe7b64 100644 --- a/modules/plugins/languages/helm.nix +++ b/modules/plugins/languages/helm.nix @@ -49,9 +49,9 @@ in { lsp = { enable = mkEnableOption "Helm LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "Helm LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "Helm LSP server to use"; }; }; }; diff --git a/modules/plugins/languages/java.nix b/modules/plugins/languages/java.nix index 4428b7cc..82fae184 100644 --- a/modules/plugins/languages/java.nix +++ b/modules/plugins/languages/java.nix @@ -72,9 +72,9 @@ in { lsp = { enable = mkEnableOption "Java LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "Java LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "Java LSP server to use"; }; }; }; diff --git a/modules/plugins/languages/julia.nix b/modules/plugins/languages/julia.nix index 16c3164f..d5310613 100644 --- a/modules/plugins/languages/julia.nix +++ b/modules/plugins/languages/julia.nix @@ -97,6 +97,8 @@ in { lsp = { enable = mkEnableOption "Java LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { + type = listOf (enum (attrNames servers)); + default = defaultServers; description = '' Julia LSP Server to Use @@ -110,8 +112,6 @@ in { Julia in your devshells. ::: ''; - type = listOf (enum (attrNames servers)); - default = defaultServers; }; }; }; diff --git a/modules/plugins/languages/kotlin.nix b/modules/plugins/languages/kotlin.nix index 27875336..f316c4cb 100644 --- a/modules/plugins/languages/kotlin.nix +++ b/modules/plugins/languages/kotlin.nix @@ -63,9 +63,9 @@ in { lsp = { enable = mkEnableOption "Kotlin LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "Kotlin LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "Kotlin LSP server to use"; }; }; diff --git a/modules/plugins/languages/lua.nix b/modules/plugins/languages/lua.nix index 6bc9941e..e454eaa8 100644 --- a/modules/plugins/languages/lua.nix +++ b/modules/plugins/languages/lua.nix @@ -64,9 +64,9 @@ in { lsp = { enable = mkEnableOption "Lua LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "Lua LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "Lua LSP server to use"; }; lazydev.enable = mkEnableOption "lazydev.nvim integration, useful for neovim plugin developers"; diff --git a/modules/plugins/languages/nim.nix b/modules/plugins/languages/nim.nix index 571f0761..289c9691 100644 --- a/modules/plugins/languages/nim.nix +++ b/modules/plugins/languages/nim.nix @@ -59,24 +59,24 @@ in { enable = mkEnableOption "Nim LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "Nim LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "Nim LSP server to use"; }; }; format = { enable = mkEnableOption "Nim formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { - description = "Nim formatter to use"; type = enum (attrNames formats); default = defaultFormat; + description = "Nim formatter to use"; }; package = mkOption { - description = "Nim formatter package"; type = package; default = formats.${cfg.format.type}.package; + description = "Nim formatter package"; }; }; }; diff --git a/modules/plugins/languages/nix.nix b/modules/plugins/languages/nix.nix index 8b3d1e0b..c460ca50 100644 --- a/modules/plugins/languages/nix.nix +++ b/modules/plugins/languages/nix.nix @@ -98,9 +98,9 @@ in { lsp = { enable = mkEnableOption "Nix LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "Nix LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "Nix LSP server to use"; }; }; diff --git a/modules/plugins/languages/nu.nix b/modules/plugins/languages/nu.nix index 21acccb3..55711104 100644 --- a/modules/plugins/languages/nu.nix +++ b/modules/plugins/languages/nu.nix @@ -46,9 +46,9 @@ in { enable = mkEnableOption "Nu LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "Nu LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "Nu LSP server to use"; }; }; }; diff --git a/modules/plugins/languages/ocaml.nix b/modules/plugins/languages/ocaml.nix index f0976048..a8f964e9 100644 --- a/modules/plugins/languages/ocaml.nix +++ b/modules/plugins/languages/ocaml.nix @@ -74,23 +74,23 @@ in { enable = mkEnableOption "OCaml LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "OCaml LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "OCaml LSP server to use"; }; }; format = { enable = mkEnableOption "OCaml formatting support (ocamlformat)" // {default = config.vim.languages.enableFormat;}; type = mkOption { - description = "OCaml formatter to use"; type = enum (attrNames formats); default = defaultFormat; + description = "OCaml formatter to use"; }; package = mkOption { - description = "OCaml formatter package"; type = package; default = formats.${cfg.format.type}.package; + description = "OCaml formatter package"; }; }; }; diff --git a/modules/plugins/languages/odin.nix b/modules/plugins/languages/odin.nix index 9b82bcb8..1b1bd751 100644 --- a/modules/plugins/languages/odin.nix +++ b/modules/plugins/languages/odin.nix @@ -46,9 +46,9 @@ in { enable = mkEnableOption "Odin LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "Odin LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "Odin LSP server to use"; }; }; }; diff --git a/modules/plugins/languages/php.nix b/modules/plugins/languages/php.nix index 0818a5eb..9eaae168 100644 --- a/modules/plugins/languages/php.nix +++ b/modules/plugins/languages/php.nix @@ -77,9 +77,9 @@ in { enable = mkEnableOption "PHP LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "PHP LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "PHP LSP server to use"; }; }; }; diff --git a/modules/plugins/languages/python.nix b/modules/plugins/languages/python.nix index 1fc26e40..aba4cd7e 100644 --- a/modules/plugins/languages/python.nix +++ b/modules/plugins/languages/python.nix @@ -229,9 +229,9 @@ in { enable = mkEnableOption "Python LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "Python LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "Python LSP server to use"; }; }; @@ -239,30 +239,30 @@ in { enable = mkEnableOption "Python formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { - description = "Python formatter to use"; type = enum (attrNames formats); default = defaultFormat; + description = "Python formatter to use"; }; package = mkOption { - description = "Python formatter package"; type = package; default = formats.${cfg.format.type}.package; + description = "Python formatter package"; }; }; # TODO this implementation is very bare bones, I don't know enough python to implement everything dap = { enable = mkOption { - description = "Enable Python Debug Adapter"; type = bool; default = config.vim.languages.enableDAP; + description = "Enable Python Debug Adapter"; }; debugger = mkOption { - description = "Python debugger to use"; type = enum (attrNames debuggers); default = defaultDebugger; + description = "Python debugger to use"; }; package = mkOption { diff --git a/modules/plugins/languages/r.nix b/modules/plugins/languages/r.nix index 7f5ffc95..9f28900a 100644 --- a/modules/plugins/languages/r.nix +++ b/modules/plugins/languages/r.nix @@ -77,9 +77,9 @@ in { enable = mkEnableOption "R LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "R LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "R LSP server to use"; }; }; diff --git a/modules/plugins/languages/sql.nix b/modules/plugins/languages/sql.nix index bbe7ffc2..7321dcf5 100644 --- a/modules/plugins/languages/sql.nix +++ b/modules/plugins/languages/sql.nix @@ -59,18 +59,18 @@ in { enable = mkEnableOption "SQL language support"; dialect = mkOption { - description = "SQL dialect for sqlfluff (if used)"; type = str; default = "ansi"; + description = "SQL dialect for sqlfluff (if used)"; }; treesitter = { enable = mkEnableOption "SQL treesitter" // {default = config.vim.languages.enableTreesitter;}; package = mkOption { - description = "SQL treesitter grammar to use"; type = package; default = pkgs.vimPlugins.nvim-treesitter.builtGrammars.sql; + description = "SQL treesitter grammar to use"; }; }; @@ -78,9 +78,9 @@ in { enable = mkEnableOption "SQL LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "SQL LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "SQL LSP server to use"; }; }; @@ -88,15 +88,15 @@ in { enable = mkEnableOption "SQL formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { - description = "SQL formatter to use"; type = enum (attrNames formats); default = defaultFormat; + description = "SQL formatter to use"; }; package = mkOption { - description = "SQL formatter package"; type = package; default = formats.${cfg.format.type}.package; + description = "SQL formatter package"; }; }; diff --git a/modules/plugins/languages/svelte.nix b/modules/plugins/languages/svelte.nix index dd0bbc21..a876f65d 100644 --- a/modules/plugins/languages/svelte.nix +++ b/modules/plugins/languages/svelte.nix @@ -90,9 +90,9 @@ in { enable = mkEnableOption "Svelte LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "Svelte LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "Svelte LSP server to use"; }; }; @@ -100,15 +100,15 @@ in { enable = mkEnableOption "Svelte formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { - description = "Svelte formatter to use"; type = enum (attrNames formats); default = defaultFormat; + description = "Svelte formatter to use"; }; package = mkOption { - description = "Svelte formatter package"; type = package; default = formats.${cfg.format.type}.package; + description = "Svelte formatter package"; }; }; diff --git a/modules/plugins/languages/tailwind.nix b/modules/plugins/languages/tailwind.nix index be895387..601f0f88 100644 --- a/modules/plugins/languages/tailwind.nix +++ b/modules/plugins/languages/tailwind.nix @@ -154,9 +154,9 @@ in { enable = mkEnableOption "Tailwindcss LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "Tailwindcss LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "Tailwindcss LSP server to use"; }; }; }; diff --git a/modules/plugins/languages/terraform.nix b/modules/plugins/languages/terraform.nix index 4e13ecf0..5f3952df 100644 --- a/modules/plugins/languages/terraform.nix +++ b/modules/plugins/languages/terraform.nix @@ -36,9 +36,9 @@ in { enable = mkEnableOption "Terraform LSP support (terraform-ls)" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "Terraform LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "Terraform LSP server to use"; }; }; }; diff --git a/modules/plugins/languages/typst.nix b/modules/plugins/languages/typst.nix index 720b3f7a..2bc4af42 100644 --- a/modules/plugins/languages/typst.nix +++ b/modules/plugins/languages/typst.nix @@ -114,9 +114,9 @@ in { enable = mkEnableOption "Typst LSP support (typst-lsp)" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "Typst LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "Typst LSP server to use"; }; }; @@ -124,15 +124,15 @@ in { enable = mkEnableOption "Typst document formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { - description = "Typst formatter to use"; type = enum (attrNames formats); default = defaultFormat; + description = "Typst formatter to use"; }; package = mkOption { - description = "Typst formatter package"; type = package; default = formats.${cfg.format.type}.package; + description = "Typst formatter package"; }; }; diff --git a/modules/plugins/languages/vala.nix b/modules/plugins/languages/vala.nix index 5bc91def..85058e32 100644 --- a/modules/plugins/languages/vala.nix +++ b/modules/plugins/languages/vala.nix @@ -73,9 +73,9 @@ in { lsp = { enable = mkEnableOption "Vala LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "Vala LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "Vala LSP server to use"; }; }; }; diff --git a/modules/plugins/languages/yaml.nix b/modules/plugins/languages/yaml.nix index 2dc969c5..de503e9c 100644 --- a/modules/plugins/languages/yaml.nix +++ b/modules/plugins/languages/yaml.nix @@ -56,9 +56,9 @@ in { lsp = { enable = mkEnableOption "Yaml LSP support" // {default = config.vim.lsp.enable;}; servers = mkOption { - description = "Yaml LSP server to use"; type = listOf (enum (attrNames servers)); default = defaultServers; + description = "Yaml LSP server to use"; }; }; };