update

3 files changed, 28 insertions, 44 deletions

diff --git a/.config/nvim/lua/plugins/file_explorer.lua b/.config/nvim/lua/plugins/file_explorer.lua
deleted file mode 100644
index 8b27dc9..0000000
--- a/.config/nvim/lua/plugins/file_explorer.lua
+++ /dev/null
@@ -1,28 +0,0 @@
-return {
-  {
-    -- https://github.com/nvim-neo-tree/neo-tree.nvim
-    "nvim-neo-tree/neo-tree.nvim",
-    branch = "v3.x",
-    dependencies = {
-      "nvim-lua/plenary.nvim",
-      "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
-      "MunifTanjim/nui.nvim",
-      -- Optional image support for file preview: See `# Preview Mode` for more information.
-      -- {"3rd/image.nvim", opts = {}},
-      -- OR use snacks.nvim's image module:
-      -- "folke/snacks.nvim",
-    },
-    lazy = false, -- neo-tree will lazily load itself
-    opts = {
-      window = {
-        position = "float",
-        popup = {
-          size = {
-            height = "70%",
-            width = "70%",
-          },
-        },
-      },
-    },
-  }
-}
diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua
index d863802..296e73a 100644
--- a/.config/nvim/lua/plugins/lsp.lua
+++ b/.config/nvim/lua/plugins/lsp.lua
@@ -3,6 +3,10 @@
 -- Goto definition with :Goto
 -- Open code action with :Codeact
 
+local servers = {
+  "lua_ls", "bashls", "clangd", "marksman", "pyright", "lemminx",
+}
+
 return {
   {
     "williamboman/mason.nvim",
@@ -15,7 +19,7 @@ return {
     "williamboman/mason-lspconfig.nvim",
     config = function()
       require("mason-lspconfig").setup {
-        ensure_installed = { "bashls", "lua_ls", "clangd", "marksman", "pyright", "rust_analyzer", "lemminx" },
+        ensure_installed = servers,
         automatic_installation = true,
       }
     end
@@ -27,21 +31,11 @@ return {
       -- Advertise autocompletion to lsp
       local capabilities = require('cmp_nvim_lsp').default_capabilities()
       local lspconfig = require("lspconfig")
-      lspconfig.bashls.setup({
-        capabilities = capabilities
-      })
-      lspconfig.lua_ls.setup({
-        capabilities = capabilities
-      })
-      lspconfig.clangd.setup({
-        capabilities = capabilities
-      })
-      lspconfig.marksman.setup({
-        capabilities = capabilities
-      })
-      lspconfig.pyright.setup({
-        capabilities = capabilities
-      })
+      for _, server in ipairs(servers) do
+        lspconfig[server].setup {
+          capabilities = capabilities,
+        }
+      end
 
       -- Key mapping
       -- Hover for definition
diff --git a/.config/nvim/lua/plugins/rust_analyzer.lua b/.config/nvim/lua/plugins/rust_analyzer.lua
index 87dc010..914befe 100644
--- a/.config/nvim/lua/plugins/rust_analyzer.lua
+++ b/.config/nvim/lua/plugins/rust_analyzer.lua
@@ -14,6 +14,7 @@ return {
         server = {
           default_settings = {
             -- rust-analyzer language server configuration
+            -- https://rust-analyzer.github.io/book/configuration.html
             ['rust-analyzer'] = {
               checkOnSave = true,
               check = {
@@ -25,7 +26,24 @@ return {
                 autoimport = {
                   enable = false;
                 }
+              },
+              files = {
+                exclude = {
+                  "build-dir/",
+                  ".flatpak-builder",
+                }
               }
+              --settings = {
+              --  cargo = { allFeatures = true },
+              --  imports = { group = { enable = false } },
+              --  completion = { postfix = { enable = false } },
+              --  -- https://www.reddit.com/r/rust/comments/1e978l7/comment/led7ibp/
+              --  -- checkOnSave = { command = "clippy" },
+              --  checkOnSave = { command = false },
+
+              --  diagnostics = { enable = true },
+              --  rustfmt = { enable = true },
+              --}
             },
           },
         },