From e3ef0791e7462c95c77ec9014d92ec97484789c8 Mon Sep 17 00:00:00 2001
From: Gustaf Rydholm <gustaf.rydholm@gmail.com>
Date: Thu, 5 Jan 2023 02:52:05 +0100
Subject: Refactor lsp

---
 fnl/plugins.fnl | 27 ++++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'fnl/plugins.fnl')

diff --git a/fnl/plugins.fnl b/fnl/plugins.fnl
index c67edb0..2990a7f 100644
--- a/fnl/plugins.fnl
+++ b/fnl/plugins.fnl
@@ -47,21 +47,22 @@
             (require :config.gitsigns))}
  ;; LSP
  {1 :williamboman/mason.nvim
-  :event :BufReadPre
-  :dependencies [:jose-elias-alvarez/null-ls.nvim
-                 :jayp0521/mason-null-ls.nvim
-                 :tamago324/nlsp-settings.nvim
-                 :b0o/SchemaStore.nvim
-                 :williamboman/mason-lspconfig.nvim
-                 :neovim/nvim-lspconfig
-                 :williamboman/mason.nvim]
+  :cmd :Mason
+  :keys [{1 :<leader>m 2 :<cmd>Mason<cr> :desc :Mason}]
+  :dependencies [:williamboman/mason-lspconfig.nvim]
   :config (fn []
             (require :config.lsp.mason)
-            (require :config.lsp.null-ls)
-            (require :config.lsp.mason-null-ls)
-            (require :config.lsp.mason-lspconfig)
-            (let [handlers (require :config.lsp.handlers)]
-              (handlers.setup)))}
+            (require :config.lsp.mason-lspconfig))}
+ {1 :jose-elias-alvarez/null-ls.nvim
+  :event :BufReadPre
+  :config (fn []
+            (require :config.lsp.null-ls))}
+ {1 :neovim/nvim-lspconfig
+  :event :BufReadPre
+  :dependencies [:mason.nvim :b0o/SchemaStore.nvim :hrsh7th/cmp-nvim-lsp]
+  :config (fn []
+            (require :config.lsp.diagnostics)
+            (require :config.lsp.lspconfig))}
  {1 :folke/trouble.nvim
   :cmd :TroubleToggle
   :config (fn []
-- 
cgit v1.2.3-70-g09d2