diff --git a/nvim/nvim/config/nvim.ln/lua/dispatch.lua b/nvim/nvim/config/nvim.ln/lua/dispatch.lua index ab72e30..e0b4029 100644 --- a/nvim/nvim/config/nvim.ln/lua/dispatch.lua +++ b/nvim/nvim/config/nvim.ln/lua/dispatch.lua @@ -1,7 +1,3 @@ - -vim.g["dispatch_no_maps"] = 1 - - local wk = require("which-key") wk.register({ m = { diff --git a/nvim/nvim/config/nvim.ln/lua/lsp/init.lua b/nvim/nvim/config/nvim.ln/lua/lsp/init.lua index 3010652..09d489f 100644 --- a/nvim/nvim/config/nvim.ln/lua/lsp/init.lua +++ b/nvim/nvim/config/nvim.ln/lua/lsp/init.lua @@ -3,5 +3,4 @@ require("lsp.handlers").setup() require "lsp.cmp" require "lsp.signature" require "lsp.metals" -require "lsp.servers" diff --git a/nvim/nvim/config/nvim.ln/lua/lsp/lsp-install.lua b/nvim/nvim/config/nvim.ln/lua/lsp/lsp-install.lua index 59fd994..333c369 100644 --- a/nvim/nvim/config/nvim.ln/lua/lsp/lsp-install.lua +++ b/nvim/nvim/config/nvim.ln/lua/lsp/lsp-install.lua @@ -38,6 +38,15 @@ local server_settings = { }, }, }, + robotframework_ls = { + settings = { + robot = { + variables = { + RESOURCES = vim.fn.getcwd() .. "/tests/robot/", + }, + }, + } + }, } lsp_installer.settings({ diff --git a/nvim/nvim/config/nvim.ln/lua/lsp/servers/init.lua b/nvim/nvim/config/nvim.ln/lua/lsp/servers/init.lua deleted file mode 100644 index 602810a..0000000 --- a/nvim/nvim/config/nvim.ln/lua/lsp/servers/init.lua +++ /dev/null @@ -1 +0,0 @@ -require "lsp.servers.robot" diff --git a/nvim/nvim/config/nvim.ln/lua/lsp/servers/robot.lua b/nvim/nvim/config/nvim.ln/lua/lsp/servers/robot.lua deleted file mode 100644 index 21a2e7d..0000000 --- a/nvim/nvim/config/nvim.ln/lua/lsp/servers/robot.lua +++ /dev/null @@ -1,32 +0,0 @@ -local lspconfig = require "lspconfig" -local configs = require "lspconfig.configs" -local servers = require "nvim-lsp-installer.servers" -local server = require "nvim-lsp-installer.server" -local path = require "nvim-lsp-installer.path" -local pip3 = require "nvim-lsp-installer.core.managers.pip3" -local name = "robotframework-lsp" - -configs[name] = { - default_config = { - filetypes = { "robot" }, - root_dir = lspconfig.util.root_pattern ".git", - }, -} - -vim.cmd[[au BufRead,BufNewFile *.robot setfiletype robot]] - -local root_dir = server.get_server_root_path(name) - -local my_server = server.Server:new { - name = name, - root_dir = root_dir, - installer = pip3.packages { "robotframework-lsp" }, - languages = { "robot" }, - homepage = "https://github.com/robocorp/robotframework-lsp", - async = true, - default_options = { - cmd = { path.concat { pip3.venv_path(root_dir), "robotframework_ls" } }, - }, -} - -servers.register(my_server) diff --git a/nvim/nvim/config/nvim.ln/lua/plugins.lua b/nvim/nvim/config/nvim.ln/lua/plugins.lua index 27ccd65..fdcd725 100644 --- a/nvim/nvim/config/nvim.ln/lua/plugins.lua +++ b/nvim/nvim/config/nvim.ln/lua/plugins.lua @@ -80,10 +80,9 @@ return packer.startup(function(use) end } - use { - 'neovim/nvim-lspconfig', - 'williamboman/nvim-lsp-installer', - } + use 'neovim/nvim-lspconfig' + -- use 'williamboman/nvim-lsp-installer' + use '~/projects/nvim-lsp-installer' use "Hoffs/omnisharp-extended-lsp.nvim" use({'scalameta/nvim-metals', requires = { "nvim-lua/plenary.nvim" }}) use "b0o/schemastore.nvim"