From f77c8512586d81e41a658e2b4cd29bdcb0ff1bfb Mon Sep 17 00:00:00 2001 From: Jovan Djokic-Sumarac Date: Mon, 15 Jul 2024 00:56:29 +0200 Subject: [PATCH] add fennel lsp and update readme --- README.md | 2 ++ fnl/plugins/lsp-zero.fnl | 23 +++++++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 4e7ad35..3a2f4dc 100755 --- a/README.md +++ b/README.md @@ -14,6 +14,8 @@ # Installation ``` +# doas pacman -S fennel + $ git clone https://git.bonsai.cool/brk/trixy ~/.config/nvim/ nvim +"Lazy sync" ``` diff --git a/fnl/plugins/lsp-zero.fnl b/fnl/plugins/lsp-zero.fnl index 2de5905..9832025 100755 --- a/fnl/plugins/lsp-zero.fnl +++ b/fnl/plugins/lsp-zero.fnl @@ -1,17 +1,29 @@ -(local mason (require :mason)) -(mason.setup) - (local lsp (require :lsp-zero)) (lsp.preset) (local lspconfig (require :lspconfig)) (lspconfig.lua_ls.setup (lsp.nvim_lua_ls)) +(local mason (require :mason)) +(mason.setup) + +(local mason-lspc (require :mason-lspconfig)) +(mason-lspc.setup { + :ensure-installed [ + :fennel-ls + :lua-language-server + :python-lsp-server ] + + :automatic_installation true }) + ; :handlers [ + ; (fn [server_name] ((. lspconfig server_name).setup {})] + + (local cmp (require :cmp)) (local cmp_action (lsp.cmp_action)) -(lsp.on_attach (fn [client bufnr] lsp.default_keymaps {:buffer bufnr})) +(lsp.on_attach (fn [_ bufnr] lsp.default_keymaps {:buffer bufnr})) (lspconfig.pylsp.setup { :setings { @@ -23,6 +35,9 @@ (lsp.setup) +(local fennel-ls lspconfig.fennel_ls) +(fennel-ls.setup {}) + (cmp.setup { :mapping { : (cmp.mapping.confirm {:select true})