diff --git a/lua/custom/plugins/configs/lsp.lua b/lua/custom/plugins/configs/lsp.lua index 52f6184..8cd6a60 100644 --- a/lua/custom/plugins/configs/lsp.lua +++ b/lua/custom/plugins/configs/lsp.lua @@ -1,3 +1,4 @@ +local completion = require 'null-ls.builtins._meta.completion' -- Brief aside: **What is LSP?** -- -- LSP is an initialism you've probably heard, but might not understand what it is. @@ -135,6 +136,7 @@ local servers = { }, on_attach = function(client, bufnr) vim.keymap.set('n', 'tp', function() + print('pinning this file: ', vim.api.nvim_buf_get_name(0), 'bufnr: ', bufnr) client:exec_cmd({ title = 'pin', command = 'tinymist.pinMain', @@ -152,7 +154,6 @@ local servers = { end, }, html = {}, - ts_ls = {}, cssls = {}, ts_ls = {}, clangd = {}, @@ -166,10 +167,7 @@ local servers = { command = 'clippy', }, imports = { - granularity = { - group = 'module', - }, - prefix = 'self', + preferPrelude = true, }, cargo = { features = 'all', @@ -180,6 +178,10 @@ local servers = { procMacro = { enable = true, }, + assist = { + emitMustUse = true, + expressionFillDefault = true, + }, }, }, }, @@ -205,18 +207,12 @@ require('mason').setup() -- You can add other tools here that you want Mason to install -- for you, so that they are available from within Neovim. local ensure_installed = vim.tbl_keys(servers or {}) -vim.list_extend(ensure_installed, { - 'stylua', - 'typstyle', - 'prettier', - 'rust-analyzer', - 'clangd', -}) +vim.list_extend(ensure_installed, {}) require('mason-lspconfig').setup { ensure_installed = ensure_installed, automatic_installation = true, - automatic_enable = true, + automatic_enable = false, } -- some things work weird diff --git a/lua/custom/plugins/lsp.lua b/lua/custom/plugins/lsp.lua index 9d37bc7..5ad2e68 100644 --- a/lua/custom/plugins/lsp.lua +++ b/lua/custom/plugins/lsp.lua @@ -89,12 +89,12 @@ return { -- `friendly-snippets` contains a variety of premade snippets. -- See the README about individual language/framework/plugin snippets: -- https://github.com/rafamadriz/friendly-snippets - -- { - -- 'rafamadriz/friendly-snippets', - -- config = function() - -- require('luasnip.loaders.from_vscode').lazy_load() - -- end, - -- }, + { + 'rafamadriz/friendly-snippets', + config = function() + require('luasnip.loaders.from_vscode').lazy_load() + end, + }, }, }, 'saadparwaiz1/cmp_luasnip',