lsp/presets/harper: move to new lsp/presets namespace

configuration.nix

@@ -34,7 +34,7 @@ isMaximal: {
       lspSignature.enable = !isMaximal; # conflicts with blink in maximal
       otter-nvim.enable = isMaximal;
       nvim-docs-view.enable = isMaximal;
-      harper-ls.enable = isMaximal;
+      presets.harper.enable = isMaximal;
     };
 
     debugger = {

docs/manual/release-notes/rl-0.9.md

@@ -63,6 +63,8 @@
 
 - Added `json5` into `languages.json`. Some options where renamed.
 
+- Moved `vim.lsp.harper-ls` to `vim.lsp.presets.haper`.
+
 ## Changelog {#sec-release-0-9-changelog}
 
 [SecBear](https://github.com/SecBear):

modules/plugins/lsp/default.nix

@@ -9,7 +9,6 @@
     ./lspconfig
     ./lspsaga
     ./null-ls
-    ./harper-ls
 
     # lsp plugins
     ./lspsaga

modules/plugins/lsp/harper-ls/config.nix

@@ -1,57 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}: let
-  inherit (lib.modules) mkIf;
-  inherit (lib.meta) getExe;
-
-  cfg = config.vim.lsp;
-in {
-  config = mkIf (cfg.enable && cfg.harper-ls.enable) {
-    vim.lsp.servers.harper-ls = {
-      root_markers = [".git" ".harper-dictionary.txt"];
-      cmd = [(getExe pkgs.harper) "--stdio"];
-      settings = {harper-ls = cfg.harper-ls.settings;};
-      filetypes =
-        # <https://writewithharper.com/docs/integrations/language-server#Supported-Languages>
-        [
-          "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"
-          "scala"
-          "sh"
-          "swift"
-          "text"
-          "toml"
-          "typescript"
-          "typescriptreact"
-          "typst"
-        ];
-    };
-  };
-}

modules/plugins/lsp/harper-ls/default.nix

@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./harper-ls.nix
-    ./config.nix
-  ];
-}

modules/plugins/lsp/harper-ls/harper-ls.nix

@@ -1,35 +0,0 @@
-{lib, ...}: let
-  inherit (lib.options) mkOption mkEnableOption;
-  inherit (lib.types) anything attrsOf;
-in {
-  options.vim.lsp.harper-ls = {
-    enable = mkEnableOption "Harper grammar checking LSP";
-    settings = mkOption {
-      type = attrsOf anything;
-      default = {};
-      example = {
-        userDictPath = "";
-        workspaceDictPath = "";
-        fileDictPath = "";
-        linters = {
-          BoringWords = true;
-          PossessiveNoun = true;
-          SentenceCapitalization = false;
-          SpellCheck = false;
-        };
-        codeActions = {
-          ForceStable = false;
-        };
-        markdown = {
-          IgnoreLinkTitle = false;
-        };
-        diagnosticSeverity = "hint";
-        isolateEnglish = false;
-        dialect = "American";
-        maxFileLength = 120000;
-        ignoredLintsPath = {};
-      };
-      description = "Settings to pass to harper-ls";
-    };
-  };
-}

modules/plugins/lsp/presets/default.nix

@@ -1,3 +1,5 @@
 {
-  imports = [];
+  imports = [
+    ./harper.nix
+  ];
 }

modules/plugins/lsp/presets/harper.nix

@@ -0,0 +1,53 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  inherit (lib.meta) getExe;
+  inherit (lib.modules) mkIf;
+  inherit (lib.options) mkEnableOption;
+
+  cfg = config.vim.lsp.presets.harper;
+in {
+  options.vim.lsp.presets.harper = {
+    enable = mkEnableOption "the Harper grammar checking LSP";
+  };
+
+  config = mkIf cfg.enable {
+    vim.lsp.servers.harper = {
+      enable = true;
+      cmd = [(getExe pkgs.harper) "--stdio"];
+      root_markers = [".git" ".harper-dictionary.txt"];
+      filetypes = [
+        # <https://writewithharper.com/docs/integrations/language-server#Supported-Languages>
+        "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"
+      ];
+    };
+  };
+}