TYPOS IS WORKING!!! https://github.com/tekumara/typos-vscode/issues/1…

…7\#issuecomment-1832292795
fusillicode · Nov 29, 2023 · 28a1eb9 · 28a1eb9
1 parent 39fa7e5
commit 28a1eb9
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 31 deletions.
diff --git a/nvim/lua/mason-tools.lua b/nvim/lua/mason-tools.lua
@@ -8,40 +8,44 @@ return {
     helm_ls = {},
     jsonls = {},
     lua_ls = {
-      Lua = {
-        completion = {
-          callSnippet = 'Both',
-          callKeyword = 'Both',
-        },
-        format = {
-          defaultConfig = {
-            quote_style = 'single',
-            trailing_table_separator = 'always',
-            insert_final_newline = 'true',
+      settings = {
+        Lua = {
+          completion = {
+            callSnippet = 'Both',
+            callKeyword = 'Both',
+          },
+          format = {
+            defaultConfig = {
+              quote_style = 'single',
+              trailing_table_separator = 'always',
+              insert_final_newline = 'true',
+            },
           },
+          hint = { enable = true, setType = true, },
+          diagnostics = { globals = { 'vim', }, },
+          telemetry = { enable = false, },
+          workspace = { checkThirdParty = false, },
         },
-        hint = { enable = true, setType = true, },
-        diagnostics = { globals = { 'vim', }, },
-        telemetry = { enable = false, },
-        workspace = { checkThirdParty = false, },
       },
     },
     marksman = {},
     ruff_lsp = {},
     rust_analyzer = {
-      ['rust-analyzer'] = {
-        cargo = {
-          build_script = { enable = true, },
-          extraArgs = { '--profile', 'rust-analyzer', },
-          extraEnv = { CARGO_PROFILE_RUST_ANALYZER_INHERITS = 'dev', },
+      settings = {
+        ['rust-analyzer'] = {
+          cargo = {
+            build_script = { enable = true, },
+            extraArgs = { '--profile', 'rust-analyzer', },
+            extraEnv = { CARGO_PROFILE_RUST_ANALYZER_INHERITS = 'dev', },
+          },
+          check = { command = 'clippy', },
+          checkOnSave = { command = 'clippy', },
+          completion = { autoimport = { enable = true, }, },
+          imports = { enforce = true, granularity = { group = 'item', }, prefix = 'crate', },
+          lens = { debug = { enable = false, }, implementations = { enable = false, }, run = { enable = false, }, },
+          proc_macro = { enable = true, },
+          showUnlinkedFileNotification = false,
         },
-        check = { command = 'clippy', },
-        checkOnSave = { command = 'clippy', },
-        completion = { autoimport = { enable = true, }, },
-        imports = { enforce = true, granularity = { group = 'item', }, prefix = 'crate', },
-        lens = { debug = { enable = false, }, implementations = { enable = false, }, run = { enable = false, }, },
-        proc_macro = { enable = true, },
-        showUnlinkedFileNotification = false,
       },
     },
     sqlls = {},

diff --git a/nvim/lua/plugins/nvim-lspconfig.lua b/nvim/lua/plugins/nvim-lspconfig.lua
@@ -17,14 +17,12 @@ return {
       vim.keymap.set('n', '<leader>a', vim.lsp.buf.code_action, { buffer = bufnr, })
     end
 
-    for lsp, settings in pairs(require('../mason-tools')['lsps']) do
-      if lsp == 'typos_lsp' then
-        print(vim.inspect(settings))
-      end
+    for lsp, config in pairs(require('../mason-tools')['lsps']) do
       lspconfig[lsp].setup({
         capabilities = capabilities,
         on_attach = on_attach,
-        settings = settings,
+        settings = config['settings'] or {},
+        init_options = config['init_options'] or {},
       })
     end