Merge branch 'main' into feature/nix-diagnostics

modules/basic/config.nix

@@ -142,6 +142,9 @@ in {
         set spell
         set spelllang=${toString cfg.spellChecking.language}
       ''}
+      ${optionalString (cfg.leaderKey != null) ''
+        let mapleader = "${toString cfg.leaderKey}"
+      ''}
     '';
   };
 }

modules/basic/module.nix

@@ -31,6 +31,12 @@ with builtins; {
       };
     };
 
+    leaderKey = mkOption {
+      type = with types; nullOr str;
+      default = null;
+      description = "The leader key to be used internally";
+    };
+
     colourTerm = mkOption {
       type = types.bool;
       default = true;

modules/lsp/default.nix

@@ -15,5 +15,6 @@ _: {
     ./lsp-signature
     ./lightbulb
     ./lspkind
+    ./lsplines
   ];
 }

modules/lsp/lsplines/config.nix

@@ -0,0 +1,20 @@
+{
+  config,
+  lib,
+  ...
+}:
+with lib;
+with builtins; let
+  cfg = config.vim.lsp;
+in {
+  config = mkIf (cfg.enable && cfg.lsplines.enable) {
+    vim.startPlugins = ["lsp-lines"];
+    vim.luaConfigRC.lsplines = nvim.dag.entryAfter ["lspconfig"] ''
+      require("lsp_lines").setup()
+
+      vim.diagnostic.config({
+        virtual_text = false,
+      })
+    '';
+  };
+}

modules/lsp/lsplines/default.nix

@@ -0,0 +1,6 @@
+_: {
+  imports = [
+    ./config.nix
+    ./lsplines.nix
+  ];
+}

modules/lsp/lsplines/lsplines.nix

@@ -0,0 +1,9 @@
+{lib, ...}:
+with lib;
+with builtins; {
+  options.vim.lsp = {
+    lsplines = {
+      enable = mkEnableOption "diagnostics using virtual lines on top of the real line of code. [lsp_lines]";
+    };
+  };
+}