diff --git a/configuration.nix b/configuration.nix index a243c970..78dad9c7 100644 --- a/configuration.nix +++ b/configuration.nix @@ -82,6 +82,7 @@ isMaximal: { elixir.enable = false; haskell.enable = false; ruby.enable = false; + fsharp.enable = false; tailwind.enable = false; svelte.enable = false; diff --git a/docs/release-notes/rl-0.8.md b/docs/release-notes/rl-0.8.md index afb5ccd3..7f6c6ffe 100644 --- a/docs/release-notes/rl-0.8.md +++ b/docs/release-notes/rl-0.8.md @@ -277,6 +277,6 @@ - `eslint_d` now checks for configuration files to load. -[Sc3l3t0n](https://github.com/Sc3l3t0n) +[Sc3l3t0n](https://github.com/Sc3l3t0n): - Add F# support under `vim.languages.fsharp`. diff --git a/modules/plugins/languages/fsharp.nix b/modules/plugins/languages/fsharp.nix index 2b80bf11..86c08d39 100644 --- a/modules/plugins/languages/fsharp.nix +++ b/modules/plugins/languages/fsharp.nix @@ -60,30 +60,31 @@ in { lsp = { enable = mkEnableOption "F# LSP support" // {default = config.vim.languages.enableLSP;}; server = mkOption { - description = "F# LSP server to use"; type = enum (attrNames servers); default = defaultServer; + description = "F# LSP server to use"; }; package = mkOption { - description = "F# LSP server package, or the command to run as a list of strings"; type = either package (listOf str); default = servers.${cfg.lsp.server}.package; + example = ''[lib.getExe pkgs.fsautocomplete "--state-directory" "~/.cache/fsautocomplete"]''; + description = "F# LSP server package, or the command to run as a list of strings"; }; }; format = { enable = mkEnableOption "F# formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { - description = "F# formatter to use"; type = enum (attrNames formats); default = defaultFormat; + description = "F# formatter to use"; }; package = mkOption { - description = "F# formatter package"; type = package; default = formats.${cfg.format.type}.package; + description = "F# formatter package"; }; }; };