From 47cc2a369477fda7a85e6ec1e3cd1fa5d05e4b65 Mon Sep 17 00:00:00 2001
From: David JULIEN <swytch@mailo.com>
Date: Fri, 2 Dec 2022 16:12:44 +0100
Subject: [PATCH 1/4] [nvim] fix: lsp installation dir variable

this is now a global variable
---
 .config/nvim/lua/plugin/lsp/clangd.lua | 3 +--
 .config/nvim/lua/plugin/lsp/init.lua   | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.config/nvim/lua/plugin/lsp/clangd.lua b/.config/nvim/lua/plugin/lsp/clangd.lua
index 5996b05..ad11624 100644
--- a/.config/nvim/lua/plugin/lsp/clangd.lua
+++ b/.config/nvim/lua/plugin/lsp/clangd.lua
@@ -6,8 +6,7 @@
 
 local M = {}
 
-local lsp_root_path = vim.fn.stdpath("data") .. "/lsp_servers/"
-local clangd_binary = lsp_root_path .. "clangd/clangd/bin/clangd"
+local clangd_binary = _G.lsp_root_dir .. "clangd/clangd/bin/clangd"
 
 M.setup = function(opts)
     opts.settings = {
diff --git a/.config/nvim/lua/plugin/lsp/init.lua b/.config/nvim/lua/plugin/lsp/init.lua
index 274c9b6..6dbccae 100644
--- a/.config/nvim/lua/plugin/lsp/init.lua
+++ b/.config/nvim/lua/plugin/lsp/init.lua
@@ -70,6 +70,8 @@ mason.setup({
     }
 })
 
+_G.lsp_root_dir = vim.fn.stdpath("data") .. "/mason/bin"
+
 mason_lspconfig.setup({
     ensure_installed = servers,
 })

From a2ead9f0c07e00b5451bd1de19887232364219dd Mon Sep 17 00:00:00 2001
From: David JULIEN <swytch@mailo.com>
Date: Fri, 2 Dec 2022 16:13:21 +0100
Subject: [PATCH 2/4] [nvim] fix: lspconfig require formatting

---
 .config/nvim/lua/plugin/lsp/init.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.config/nvim/lua/plugin/lsp/init.lua b/.config/nvim/lua/plugin/lsp/init.lua
index 6dbccae..f4291ef 100644
--- a/.config/nvim/lua/plugin/lsp/init.lua
+++ b/.config/nvim/lua/plugin/lsp/init.lua
@@ -83,7 +83,7 @@ for _, server in ipairs(servers) do
         capabilities = capabilities,
     }
 
-    local plugin = string.format("%s.%s", "plugin.lsp", server)
+    local plugin = string.format("plugin.lsp.%s", server)
     require(plugin).setup(opts)
 
     lspconfig[server].setup(opts)

From c2d120ecf4c5ee35f7b3a75a51f15521399bc04d Mon Sep 17 00:00:00 2001
From: David JULIEN <swytch@mailo.com>
Date: Fri, 2 Dec 2022 16:14:33 +0100
Subject: [PATCH 3/4] [nvim] format: nvim lsp server list

---
 .config/nvim/lua/plugin/lsp/init.lua | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.config/nvim/lua/plugin/lsp/init.lua b/.config/nvim/lua/plugin/lsp/init.lua
index f4291ef..fbedf26 100644
--- a/.config/nvim/lua/plugin/lsp/init.lua
+++ b/.config/nvim/lua/plugin/lsp/init.lua
@@ -58,7 +58,11 @@ end
 local capabilities = vim.lsp.protocol.make_client_capabilities()
 capabilities = require("cmp_nvim_lsp").default_capabilities(capabilities)
 
-local servers = { "clangd", "sumneko_lua", "texlab" }
+local servers = {
+    "clangd",
+    "sumneko_lua",
+    "texlab",
+}
 
 mason.setup({
     ui = {

From e87b8636408c034e874a6ac4b0e4d35b6c510b8f Mon Sep 17 00:00:00 2001
From: David JULIEN <swytch@mailo.com>
Date: Fri, 2 Dec 2022 16:15:29 +0100
Subject: [PATCH 4/4] [nvim] feat: add rust_analyzer LSP

---
 .config/nvim/lua/plugin/lsp/init.lua          |  1 +
 .config/nvim/lua/plugin/lsp/rust_analyzer.lua | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 .config/nvim/lua/plugin/lsp/rust_analyzer.lua

diff --git a/.config/nvim/lua/plugin/lsp/init.lua b/.config/nvim/lua/plugin/lsp/init.lua
index fbedf26..8af6b8d 100644
--- a/.config/nvim/lua/plugin/lsp/init.lua
+++ b/.config/nvim/lua/plugin/lsp/init.lua
@@ -60,6 +60,7 @@ capabilities = require("cmp_nvim_lsp").default_capabilities(capabilities)
 
 local servers = {
     "clangd",
+    "rust_analyzer",
     "sumneko_lua",
     "texlab",
 }
diff --git a/.config/nvim/lua/plugin/lsp/rust_analyzer.lua b/.config/nvim/lua/plugin/lsp/rust_analyzer.lua
new file mode 100644
index 0000000..604a4e5
--- /dev/null
+++ b/.config/nvim/lua/plugin/lsp/rust_analyzer.lua
@@ -0,0 +1,16 @@
+-- Author        : swytch
+-- Created       : Wednesday Nov. 30, 2022 16:35:43 CET
+-- License       : GPLv3
+-- Description   : neovim lsp config file for rust_analyzer
+
+
+local M = {}
+
+local rust_analayzer_binary = _G.lsp_root_dir .. "rust_analyzer/rust_analyzer"
+
+M.setup = function(opts)
+    opts.settings = {}
+end
+
+return M
+