chore: move from plugins.lsp to lsp

Signed-off-by: Lander Van den Bulcke <landervandenbulcke@gmail.com>

config/plugins/lsp/lsp.nix

@@ -4,6 +4,9 @@ let
 in
 {
   plugins = {
+    lspconfig = {
+      enable = true;
+    };
     lsp-lines = {
       enable = true;
     };
@@ -16,9 +19,8 @@ in
     lspsaga = {
       enable = true;
     };
+  };
   lsp = {
-      enable = true;
-      inlayHints = true;
     servers = {
       html = {
         enable = true;
@@ -52,7 +54,6 @@ in
       };
       hls = {
         enable = true;
-          installGhc = true;
       };
       rubocop = {
         enable = true;
@@ -66,14 +67,13 @@ in
       puppet = {
         enable = true;
         package = puppet-editor-services;
-          cmd = [
+        settings.cmd = [
           "${puppet-editor-services}/bin/puppet-languageserver"
           "--stdio"
         ];
       };
       helm_ls = {
         enable = true;
-          extraOptions = {
         settings = {
           "helm_ls" = {
             yamlls = {
@@ -82,10 +82,8 @@ in
           };
         };
       };
-        };
       yamlls = {
         enable = true;
-          extraOptions = {
         settings = {
           yaml = {
             format = {
@@ -109,87 +107,40 @@ in
         };
       };
     };
-      };
 
-      keymaps = {
+    keymaps = [
-        silent = true;
+      {
-        lspBuf = {
+        key = "gd";
-          gd = {
+        lspBufAction = "definition";
-            action = "definition";
+      }
-            desc = "Goto Definition";
+      {
-          };
+        key = "gr";
-          gr = {
+        lspBufAction = "references";
-            action = "references";
+      }
-            desc = "Goto References";
+      {
-          };
+        key = "gD";
-          gD = {
+        lspBufAction = "declaration";
-            action = "declaration";
+      }
-            desc = "Goto Declaration";
+      {
-          };
+        key = "gI";
-          gI = {
+        lspBufAction = "implementation";
-            action = "implementation";
+      }
-            desc = "Goto Implementation";
+      {
-          };
+        key = "gT";
-          gT = {
+        lspBufAction = "type_definition";
-            action = "type_definition";
+      }
-            desc = "Type Definition";
+      {
-          };
+        key = "K";
-          K = {
+        lspBufAction = "hover";
-            action = "hover";
+      }
-            desc = "Hover";
+      {
-          };
+        key = "<leader>cw";
-          "<leader>cw" = {
+        lspBufAction = "workspace_symbol";
-            action = "workspace_symbol";
+      }
-            desc = "Workspace Symbol";
+      {
-          };
+        key = "<leader>cr";
-          "<leader>cr" = {
+        lspBufAction = "rename";
-            action = "rename";
+      }
-            desc = "Rename";
-          };
-        };
-        diagnostic = {
-          "<leader>cd" = {
-            action = "open_float";
-            desc = "Line Diagnostics";
-          };
-          "[d" = {
-            action = "goto_next";
-            desc = "Next Diagnostic";
-          };
-          "]d" = {
-            action = "goto_prev";
-            desc = "Previous Diagnostic";
-          };
-        };
-      };
-    };
-  };
-  extraPlugins = with pkgs.vimPlugins; [
-    ansible-vim
-    vim-puppet
     ];
-
-  extraConfigLua = ''
-    local _border = "rounded"
-
-    vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(
-      vim.lsp.handlers.hover, {
-        border = _border
-      }
-    )
-
-    vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(
-      vim.lsp.handlers.signature_help, {
-        border = _border
-      }
-    )
-
-    vim.diagnostic.config{
-      float={border=_border}
   };
-
-    require('lspconfig.ui.windows').default_options = {
-      border = _border
-    }
-  '';
 }