nvimrc

@@ -766,7 +766,6 @@ nvim_lsp.gopls.setup{
 
 -- Rust
 nvim_lsp.rust_analyzer.setup{
-  capabilities = capabilities,
   on_attach = on_attach,
     settings = {
         ["rust-analyzer"] = {
@@ -782,11 +781,8 @@ nvim_lsp.rust_analyzer.setup{
                 },
             },
             procMacro = {
-                enable = false,
+                enable = true
             },
-            diagnostics = {
-              disabled = { "unresolved-proc-macro" },
-            }
         }
     }
 }
@@ -844,15 +840,24 @@ nvim_lsp.diagnosticls.setup{
 
 -- Lua
 
-local lua_ls_root_path = os.getenv("HOME").."/dev/lua-language-server"
-local lua_ls_binary = lua_ls_root_path.."/bin/lua-language-server"
+local system_name
+if vim.fn.has("mac") == 1 then
+  system_name = "macOS"
+elseif vim.fn.has("unix") == 1 then
+  system_name = "Linux"
+else
+  print("Unsupported system for sumneko")
+end
+
+local sumneko_root_path = os.getenv("HOME").."/dev/lua-language-server"
+local sumneko_binary = sumneko_root_path.."/bin/"..system_name.."/lua-language-server"
 
 local runtime_path = vim.split(package.path, ';')
 table.insert(runtime_path, "lua/?.lua")
 table.insert(runtime_path, "lua/?/init.lua")
 
-nvim_lsp.lua_ls.setup {
-  cmd = {lua_ls_binary, "-E", lua_ls_root_path .. "/main.lua"};
+nvim_lsp.sumneko_lua.setup {
+  cmd = {sumneko_binary, "-E", sumneko_root_path .. "/main.lua"};
   settings = {
     Lua = {
       runtime = {