From 2bab00d2e3f05f99900f32b9d9a3481bab77a00e Mon Sep 17 00:00:00 2001
From: iofq <cjriddz@protonmail.com>
Date: Thu, 8 May 2025 02:02:06 -0500
Subject: [PATCH] use vim.lsp.config API

---
 nvim/lua/plugins/lsp.lua  | 29 ++++++++++++-----------------
 nvim/lua/plugins/mini.lua |  7 +++----
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua
index 6848030..c3ab405 100644
--- a/nvim/lua/plugins/lsp.lua
+++ b/nvim/lua/plugins/lsp.lua
@@ -31,20 +31,11 @@ return {
     'neovim/nvim-lspconfig',
     event = 'VeryLazy',
     dependencies = {
-      'folke/snacks.nvim',
       'folke/trouble.nvim',
       'saghen/blink.cmp',
     },
     config = function()
-      local lspconfig = require('lspconfig')
-      local capabilities = vim.tbl_deep_extend(
-        'force',
-        {},
-        require('blink.cmp').get_lsp_capabilities(),
-        vim.lsp.protocol.make_client_capabilities()
-      )
-      lspconfig.gopls.setup {
-        capabilities = capabilities,
+      vim.lsp.config('gopls', {
         settings = {
           gopls = {
             gofumpt = true,
@@ -69,12 +60,8 @@ return {
             staticcheck = true,
           },
         },
-      }
-      lspconfig.basedpyright.setup { capabilities = capabilities }
-      lspconfig.nil_ls.setup { capabilities = capabilities }
-      lspconfig.phpactor.setup { capabilities = capabilities }
-      lspconfig.lua_ls.setup {
-        capabilities = capabilities,
+      })
+      vim.lsp.config('lua_ls', {
         on_init = function(client)
           local path = client.workspace_folders[1].name
           if vim.loop.fs_stat(path .. '/.luarc.json') or vim.loop.fs_stat(path .. '/.luarc.jsonc') then
@@ -96,6 +83,13 @@ return {
         settings = {
           Lua = {},
         },
+      })
+
+      vim.lsp.enable {
+        'nil_ls',
+        'phpactor',
+        'gopls',
+        'lua_ls',
       }
 
       vim.api.nvim_create_autocmd('LspAttach', {
@@ -139,9 +133,10 @@ return {
           vim.keymap.set('n', 'grh', function()
             vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled())
           end, { buffer = ev.buf, noremap = true, silent = true, desc = 'LSP hints toggle' })
+
           -- Auto-refresh code lenses
           if client.server_capabilities.codeLensProvider then
-            vim.api.nvim_create_autocmd({ 'InsertLeave', 'BufWritePost', 'TextChanged' }, {
+            vim.api.nvim_create_autocmd({ 'InsertLeave', 'TextChanged' }, {
               group = vim.api.nvim_create_augroup(string.format('lsp-%s-%s', bufnr, client.id), {}),
               callback = function()
                 vim.lsp.codelens.refresh { bufnr = bufnr }
diff --git a/nvim/lua/plugins/mini.lua b/nvim/lua/plugins/mini.lua
index 6a7557e..dbc7043 100644
--- a/nvim/lua/plugins/mini.lua
+++ b/nvim/lua/plugins/mini.lua
@@ -159,10 +159,9 @@ return {
 
         local multi = require('mini.keymap').map_multistep
         local combo = require('mini.keymap').map_combo
-
-        combo({ 'v', 'r', 'i', 's' }, 'wq', '<BS><BS><Esc>l')
-        multi({ 'i', 's' }, '<Tab>', { 'blink_accept', 'vimsnippet_next' })
-        multi({ 'i', 's' }, '<S-Tab>', { 'vimsnippet_prev' })
+        combo({ 'v', 'i', 's' }, 'wq', '<BS><BS><Esc>l')
+        multi({ 'i', 's' }, '<Tab>', { 'vimsnippet_next', 'increase_indent' })
+        multi({ 'i', 's' }, '<S-Tab>', { 'vimsnippet_prev', 'decrease_indent' })
       end)
     end,
   },