From d6a310252fd307acf90d2171368ee6e1b05b3950 Mon Sep 17 00:00:00 2001 From: Marlon Rosenberg Date: Tue, 25 Mar 2025 19:42:50 +0000 Subject: [PATCH] languages/fsharp: resolve comments --- configuration.nix | 1 + modules/plugins/languages/fsharp.nix | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) 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/modules/plugins/languages/fsharp.nix b/modules/plugins/languages/fsharp.nix index 2b80bf11..ee728060 100644 --- a/modules/plugins/languages/fsharp.nix +++ b/modules/plugins/languages/fsharp.nix @@ -60,14 +60,14 @@ in { lsp = { enable = mkEnableOption "F# LSP support" // {default = config.vim.languages.enableLSP;}; server = mkOption { - description = "F# LSP server to use"; type = enum (attrNames servers); + description = "F# LSP server to use"; default = defaultServer; }; package = mkOption { - description = "F# LSP server package, or the command to run as a list of strings"; type = either package (listOf str); + description = "F# LSP server package, or the command to run as a list of strings"; default = servers.${cfg.lsp.server}.package; }; }; @@ -75,14 +75,14 @@ in { enable = mkEnableOption "F# formatting" // {default = config.vim.languages.enableFormat;}; type = mkOption { - description = "F# formatter to use"; type = enum (attrNames formats); + description = "F# formatter to use"; default = defaultFormat; }; package = mkOption { - description = "F# formatter package"; type = package; + description = "F# formatter package"; default = formats.${cfg.format.type}.package; }; };