diff --git a/nvim/lua/init.lua b/nvim/lua/init.lua index cd1175d..2b58cb5 100644 --- a/nvim/lua/init.lua +++ b/nvim/lua/init.lua @@ -12,7 +12,7 @@ require('plugins.treesitter') --require('plugins.noice') require('plugins.statuscol') vim.diagnostic.config({ - virtual_text = false, + virtual_lines = { current_line = true, }, underline = true, signs = { text = { diff --git a/nvim/lua/plugins/lua_ls.lua b/nvim/lua/plugins/lua_ls.lua index fd36b83..9d844cd 100644 --- a/nvim/lua/plugins/lua_ls.lua +++ b/nvim/lua/plugins/lua_ls.lua @@ -1,8 +1,8 @@ -local coq = require("coq") -local util = require("lspconfig.util") -require('lspconfig').lua_ls.setup( - coq.lsp_ensure_capabilities({ +vim.lsp.config.lua_ls = + { cmd = { os.getenv("HOME") .. "/lua-language-server/bin/lua-language-server" }, - root_dir = util.root_pattern('init.lua'), - }) -) + root_markers = { 'init.lua' }, + filetypes = { 'lua' }, + } + +vim.lsp.enable({'lua_ls'}) diff --git a/nvim/lua/plugins/matlab_ls.lua b/nvim/lua/plugins/matlab_ls.lua index f3b1071..af6a2fa 100644 --- a/nvim/lua/plugins/matlab_ls.lua +++ b/nvim/lua/plugins/matlab_ls.lua @@ -1,7 +1,6 @@ -local coq = require("coq") local util = require("lspconfig.util") require('lspconfig').matlab_ls.setup( - coq.lsp_ensure_capabilities({ + { cmd = { "node", os.getenv("HOME") .. "/MATLAB-language-server/out/index.js", "--stdio" }, root_dir = util.root_pattern('mw_anchor'), single_file_support = true, @@ -13,5 +12,5 @@ require('lspconfig').matlab_ls.setup( telemetry = false } } - }) + } ) diff --git a/nvim/lua/plugins/statusline.lua b/nvim/lua/plugins/statusline.lua index 9f6d9d2..faf57c9 100644 --- a/nvim/lua/plugins/statusline.lua +++ b/nvim/lua/plugins/statusline.lua @@ -24,7 +24,7 @@ GetTime = function() end GetLSP = function() - local clients = vim.lsp.buf_get_clients() + local clients = vim.lsp.get_clients() if next(clients) ~= nil then local name = string.format('%s',clients[1].name) local root = clients[1].root_dir diff --git a/zsh/custom.zsh b/zsh/custom.zsh index ef1ad5e..b3cd52e 100644 --- a/zsh/custom.zsh +++ b/zsh/custom.zsh @@ -10,7 +10,7 @@ export PATH=$PATH:~/go/bin # export PATH=$PATH:~/.zig # neovim -export PATH=$PATH:/usr/bin/nvim-linux64/bin +export PATH="$PATH:/opt/nvim-linux-x86_64/bin" # picotool export PATH=$PATH:~/picotool/build