configuration.nix

@@ -73,7 +73,6 @@ inputs: let
         go.enable = isMaximal;
         elixir.enable = isMaximal;
         zig.enable = isMaximal;
-        ocaml.enable = isMaximal;
         python.enable = isMaximal;
         dart.enable = isMaximal;
         bash.enable = isMaximal;

modules/plugins/languages/ocaml.nix

@@ -4,49 +4,15 @@
   lib,
   ...
 }: let
-  inherit (builtins) attrNames;
   inherit (lib.options) mkEnableOption mkOption;
   inherit (lib.modules) mkIf mkMerge;
   inherit (lib.meta) getExe;
   inherit (lib.lists) isList;
-  inherit (lib.types) either enum listOf package str;
+  inherit (lib.types) either listOf package str;
   inherit (lib.nvim.types) mkGrammarOption;
   inherit (lib.nvim.lua) expToLua;
 
   cfg = config.vim.languages.ocaml;
-
-  defaultServer = "ocaml-lsp";
-  servers = {
-    ocaml-lsp = {
-      package = pkgs.ocamlPackages.ocaml-lsp;
-      lspConfig = ''
-        lspconfig.ocamllsp.setup {
-          capabilities = capabilities,
-          on_attach = default_on_attach,
-            cmd = ${
-          if isList cfg.lsp.package
-          then expToLua cfg.lsp.package
-          else ''{"${getExe cfg.lsp.package}"}''
-        };
-        }
-      '';
-    };
-  };
-
-  defaultFormat = "ocamlformat";
-  formats = {
-    ocamlformat = {
-      package = pkgs.ocamlPackages.ocamlformat;
-      nullConfig = ''
-        table.insert(
-          ls_sources,
-          null_ls.builtins.formatting.ocamlformat.with({
-            command = "${cfg.format.package}/bin/ocamlformat",
-          })
-        )
-      '';
-    };
-  };
 in {
   options.vim.languages.ocaml = {
     enable = mkEnableOption "OCaml language support";
@@ -58,29 +24,19 @@ in {
 
     lsp = {
       enable = mkEnableOption "OCaml LSP support (ocaml-lsp)" // {default = config.vim.languages.enableLSP;};
-      server = mkOption {
-        description = "OCaml LSP server to user";
-        type = enum (attrNames servers);
-        default = defaultServer;
-      };
       package = mkOption {
-        description = "OCaml language server package, or the command to run as a list of strings";
+        description = "ocaml language server package, or the command to run as a list of strings";
         type = either package (listOf str);
-        default = servers.${cfg.lsp.server}.package;
+        default = pkgs.ocamlPackages.ocaml-lsp;
       };
     };
 
     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;
-      };
       package = mkOption {
         description = "OCaml formatter package";
         type = package;
-        default = formats.${cfg.format.type}.package;
+        default = pkgs.ocamlPackages.ocamlformat;
       };
     };
   };
@@ -88,7 +44,17 @@ in {
   config = mkIf cfg.enable (mkMerge [
     (mkIf cfg.lsp.enable {
       vim.lsp.lspconfig.enable = true;
-      vim.lsp.lspconfig.sources.ocaml-lsp = servers.${cfg.lsp.server}.lspConfig;
+      vim.lsp.lspconfig.sources.ocaml-lsp = ''
+        lspconfig.ocamllsp.setup {
+          capabilities = capabilities,
+          on_attach = default_on_attach,
+            cmd = ${
+            if isList cfg.lsp.package
+            then expToLua cfg.lsp.package
+            else ''{"${getExe cfg.lsp.package}"}''
+          };
+        }
+      '';
     })
 
     (mkIf cfg.treesitter.enable {
@@ -98,8 +64,14 @@ in {
 
     (mkIf cfg.format.enable {
       vim.lsp.null-ls.enable = true;
-      vim.lsp.null-ls.sources.ocamlformat = formats.${cfg.format.type}.nullConfig;
+      vim.lsp.null-ls.sources.ocamlformat = ''
-      vim.extraPackages = [formats.${cfg.format.type}.package];
+        table.insert(
+          ls_sources,
+          null_ls.builtins.formatting.ocamlformat.with({
+            command = "${cfg.format.package}/bin/ocamlformat",
+          })
+        )
+      '';
     })
   ]);
 }