Diff
1diff --git a/dot_config/nvim/lazy-lock.json b/dot_config/nvim/lazy-lock.json
2index 99778df4f67b3f75c68b44e4e9bf6647608acc28..ed4f024996af8f7bd1c662a9f7a3256846ffb132 100644
3--- a/dot_config/nvim/lazy-lock.json
4+++ b/dot_config/nvim/lazy-lock.json
5@@ -1,32 +1,32 @@
6 {
7 "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
8- "LuaSnip": { "branch": "master", "commit": "2463d687fe704b76eb0aa3bb34e95f69a5bb0362" },
9+ "LuaSnip": { "branch": "master", "commit": "82108e7e31cc6fc223cc5df5cae6d89f70bb199f" },
10 "bufferline.nvim": { "branch": "main", "commit": "6c456b888823d9e4832aa91c482bccd19445c009" },
11 "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
12 "copilot.vim": { "branch": "release", "commit": "5b19fb001d7f31c4c7c5556d7a97b243bd29f45f" },
13 "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
14- "gitsigns.nvim": { "branch": "main", "commit": "d195f0c35ced5174d3ecce1c4c8ebb3b5bc23fa9" },
15+ "gitsigns.nvim": { "branch": "main", "commit": "3e6e91b09f0468c32d3b96dcacf4b947f037ce25" },
16 "go.nvim": { "branch": "master", "commit": "24d2fa373d55d9900cd4b502a88214dc17e6fab6" },
17- "gruvbox.nvim": { "branch": "main", "commit": "f0e029a3989691eb38cfa9272b75251c62a00821" },
18+ "gruvbox.nvim": { "branch": "main", "commit": "4176b0b720db0c90ab4030e5c1b4893faf41fd51" },
19 "guihua.lua": { "branch": "master", "commit": "9fb6795474918b492d9ab01b1ebaf85e8bf6fe0b" },
20 "jester": { "branch": "main", "commit": "424b96970ac49da7b1298502e03143a8f11d5bcf" },
21 "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
22- "lsp-zero.nvim": { "branch": "v3.x", "commit": "ae66805dcfcc473aa30f317549fd6928c330adce" },
23+ "lsp-zero.nvim": { "branch": "v3.x", "commit": "433db11e818d07a5151e2c750ca8f09cc2aa3146" },
24 "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" },
25- "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" },
26- "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" },
27- "neodev.nvim": { "branch": "main", "commit": "8526ce7de23e04735827a4e3f78ff634880181c5" },
28+ "mason-lspconfig.nvim": { "branch": "main", "commit": "0989bdf4fdf7b5aa4c74131d7ffccc3f399ac788" },
29+ "mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" },
30+ "neodev.nvim": { "branch": "main", "commit": "be8d4d4cab6c13c6a572269c9d6a63774baba9a0" },
31 "nvim-autopairs": { "branch": "master", "commit": "9fd41181693dd4106b3e414a822bb6569924de81" },
32 "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" },
33 "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
34 "nvim-cursorword": { "branch": "master", "commit": "c0f2958ec729b47be2dba0d79ef43d005dac9f4e" },
35 "nvim-dap": { "branch": "master", "commit": "f0dca670fa059eb89dda8869a6310c804241345c" },
36- "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
37+ "nvim-dap-ui": { "branch": "master", "commit": "7e5e16427aaf814dc2d58e1b219def9ef2fa2435" },
38 "nvim-dap-virtual-text": { "branch": "master", "commit": "d4542ac257d3c7ee4131350db6179ae6340ce40b" },
39- "nvim-lspconfig": { "branch": "master", "commit": "9099871a7c7e1c16122e00d70208a2cd02078d80" },
40+ "nvim-lspconfig": { "branch": "master", "commit": "796394fd19fb878e8dbc4fd1e9c9c186ed07a5f4" },
41 "nvim-surround": { "branch": "main", "commit": "703ec63aa798e5e07d309b35e42def34bebe0174" },
42- "nvim-treesitter": { "branch": "master", "commit": "7a2c6211d6f550988fccd8800de8426d5e480a2d" },
43- "nvim-web-devicons": { "branch": "master", "commit": "43aa2ddf476012a2155f5f969ee55ab17174da7a" },
44+ "nvim-treesitter": { "branch": "master", "commit": "8cd2b230174efbf7b5d9f49fe2f90bda6b5eb16e" },
45+ "nvim-web-devicons": { "branch": "master", "commit": "db0c864375c198cacc171ff373e76bfce2a85045" },
46 "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
47 "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
48 "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
49@@ -35,7 +35,7 @@
50 "telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
51 "undotree": { "branch": "master", "commit": "36ff7abb6b60980338344982ad4cdf03f7961ecd" },
52 "vim-fugitive": { "branch": "master", "commit": "59659093581aad2afacedc81f009ed6a4bfad275" },
53- "vim-matchup": { "branch": "master", "commit": "2550178c43464134ce65328da458905f70dbe041" },
54+ "vim-matchup": { "branch": "master", "commit": "e2cca1747ab175b8d839a5d28679427564643a57" },
55 "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
56 "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
57 "whitespace.nvim": { "branch": "master", "commit": "f0fc9e9c4ce3f7d2166e9e5a069b64b9ca4a3f15" }
58diff --git a/dot_config/nvim/lua/lsp.lua b/dot_config/nvim/lua/lsp.lua
59index 105b9b7b846f1b1db3decca8b0b14b60ce59cec6..308fc999c51f09f70bf945c7e0bc4f8f7fbba993 100644
60--- a/dot_config/nvim/lua/lsp.lua
61+++ b/dot_config/nvim/lua/lsp.lua
62@@ -1,7 +1,10 @@
63 -- Load default lsp-zero keymaps
64 local lsp_zero = require("lsp-zero")
65 local telescope = require("telescope.builtin")
66+
67+-- Install LSP servers automatically through Mason
68 require("mason").setup()
69+require("mason-lspconfig").setup({ automatic_installation = true })
70
71 lsp_zero.on_attach(function(_, bufnr)
72 -- see :help lsp-zero-keybindings to learn the available actions
73@@ -54,7 +57,17 @@ lsp_zero.format_on_save({
74 -- Setup LSP servers
75 local lspconfig = require("lspconfig")
76 -- go
77-lspconfig.golangci_lint_ls.setup({})
78+lspconfig.golangci_lint_ls.setup({
79+ root_dir = require("lspconfig.util").root_pattern(
80+ "go.mod",
81+ "go.work",
82+ ".golangci.yml",
83+ ".golangci.yaml",
84+ ".golangci.toml",
85+ ".golangci.json",
86+ ".git"
87+ ),
88+})
89 lspconfig.gopls.setup({
90 settings = {
91 gopls = {
92@@ -62,6 +75,16 @@ lspconfig.gopls.setup({
93 },
94 },
95 })
96+-- rust
97+lspconfig.rust_analyzer.setup({
98+ settings = {
99+ ["rust-analyzer"] = {
100+ diagnostics = {
101+ enable = false,
102+ },
103+ },
104+ },
105+})
106 -- lua
107 lspconfig.lua_ls.setup(lsp_zero.nvim_lua_ls())
108 -- protobuf
109@@ -136,9 +159,6 @@ lspconfig.yamlls.setup({})
110 -- end,
111 -- })
112
113--- Install LSP servers automatically
114-require("mason-lspconfig").setup({ automatic_installation = true })
115-
116 -- Customize keymaps
117 local cmp = require("cmp")
118 cmp.setup({