From b2a3bc393e3288a743f91cf7ef13fb94fa66e25f Mon Sep 17 00:00:00 2001
From: newbieQQ <qyh1510@gmail.com>
Date: Sun, 17 May 2026 22:03:51 +0800
Subject: [PATCH] update

---
 init.lua                     | 67 +++++++++++++++++++-----------------
 lua/plugs/dev.lua            |  5 +++
 lua/plugs/nvim-lspconfig.lua | 32 ++++++++++++-----
 lua/{vscode.lua => vsc.lua}  |  0
 4 files changed, 64 insertions(+), 40 deletions(-)
 rename lua/{vscode.lua => vsc.lua} (100%)

diff --git a/init.lua b/init.lua
index 891b5df..8bb8747 100644
--- a/init.lua
+++ b/init.lua
@@ -1,43 +1,46 @@
 G = require('G')
 
-local lazypath = G.fn.stdpath("data") .. "/lazy/lazy.nvim"
+if not G.g.vscode then
 
-if not G.loop.fs_stat(lazypath) then
-  G.fn.system({
-    "git",
-    "clone",
-    "--filter=blob:none",
-    "https://github.com/folke/lazy.nvim.git",
-    "--branch=stable",
-    lazypath,
-  })
+  local lazypath = G.fn.stdpath("data") .. "/lazy/lazy.nvim"
+
+  if not G.loop.fs_stat(lazypath) then
+    G.fn.system({
+      "git",
+      "clone",
+      "--filter=blob:none",
+      "https://github.com/folke/lazy.nvim.git",
+      "--branch=stable",
+      lazypath,
+    })
 
 
-  G.fn.system({
-    "git",
-    "config",
-    "--global",
-    "credential.helper",
-    "store",
-  })
-end
+    G.fn.system({
+      "git",
+      "config",
+      "--global",
+      "credential.helper",
+      "store",
+    })
+  end
 
-G.opt.rtp:prepend(lazypath)
+  G.opt.rtp:prepend(lazypath)
 
-require("keymap")
+  require("keymap")
 
 
-if G.g.vscode then
-  require('vscode')
-else
-  require("options")
-  local clone_prefix = G.use_ssh and "git@github.com:%s.git" or "https://github.com/%s.git"
-  require("lazy").setup(
-    require('plugs'), {
-      lockfile = G.fn.stdpath("data") .. "/lazy/lazy-lock.json",
-      git      = {
-        url_format = clone_prefix,
+  if G.g.vscode then
+    require('vscode')
+  else
+    require("options")
+    local clone_prefix = G.use_ssh and "git@github.com:%s.git" or "https://github.com/%s.git"
+    require("lazy").setup(
+      require('plugs'), {
+        lockfile = G.fn.stdpath("data") .. "/lazy/lazy-lock.json",
+        git      = {
+          url_format = clone_prefix,
+        }
       }
-    }
-  )
+    )
+  end
 end
diff --git a/lua/plugs/dev.lua b/lua/plugs/dev.lua
index d82797e..e332706 100644
--- a/lua/plugs/dev.lua
+++ b/lua/plugs/dev.lua
@@ -23,6 +23,11 @@ return {
   --   ft = { "go", 'gomod' },
   --   build = ':lua require("go.install").update_all_sync()' -- if you need to install/update all binaries
   -- },
+  {
+    -- conda 环境
+    "kmontocam/nvim-conda",
+    dependencies = { "nvim-lua/plenary.nvim" },
+  },
   {
     -- 终端
     'akinsho/toggleterm.nvim',
diff --git a/lua/plugs/nvim-lspconfig.lua b/lua/plugs/nvim-lspconfig.lua
index 957a986..9edd0b6 100644
--- a/lua/plugs/nvim-lspconfig.lua
+++ b/lua/plugs/nvim-lspconfig.lua
@@ -8,13 +8,29 @@ return {
     config = function()
       require 'neodev'.setup {}
 
-      require 'lspconfig'.lua_ls.setup(require('lsp.lua'))
-      require 'lspconfig'.clangd.setup(require('lsp.c'))
-      require 'lspconfig'.bashls.setup(require('lsp.bash'))
-      require 'lspconfig'.basedpyright.setup(require('lsp.basedpyright'))
-      require 'lspconfig'.yamlls.setup(require('lsp.yaml'))
-      require 'lspconfig'.gopls.setup(require('lsp.go'))
-      require 'lspconfig'.jsonls.setup(require('lsp.json'))
+      -- 定义需要启用的服务器列表及其对应的配置
+      local servers = {
+        lua_ls = require('lsp.lua'),
+        clangd = require('lsp.c'),
+        bashls = require('lsp.bash'),
+        basedpyright = require('lsp.basedpyright'),
+        yamlls = require('lsp.yaml'),
+        gopls = require('lsp.go'),
+        jsonls = require('lsp.json'),
+      }
+
+      -- 使用 Neovim 0.11+ 的新 API 进行配置和启用
+      for server, config in pairs(servers) do
+        vim.lsp.config(server, config)
+        vim.lsp.enable(server)
+      end
+      -- require 'lspconfig'.lua_ls.setup(require('lsp.lua'))
+      -- require 'lspconfig'.clangd.setup(require('lsp.c'))
+      -- require 'lspconfig'.bashls.setup(require('lsp.bash'))
+      -- require 'lspconfig'.basedpyright.setup(require('lsp.basedpyright'))
+      -- require 'lspconfig'.yamlls.setup(require('lsp.yaml'))
+      -- require 'lspconfig'.gopls.setup(require('lsp.go'))
+      -- require 'lspconfig'.jsonls.setup(require('lsp.json'))
 
 
       G.map({
@@ -280,7 +296,7 @@ return {
             }
           }
         }
-        require 'nvim-treesitter.configs'.setup(treesitter_opt)
+        require 'nvim-treesitter'.setup(treesitter_opt)
         require 'nvim-treesitter.install'.prefer_git = true
         if G.use_ssh then
           local parsers = require 'nvim-treesitter.parsers'.get_parser_configs()
diff --git a/lua/vscode.lua b/lua/vsc.lua
similarity index 100%
rename from lua/vscode.lua
rename to lua/vsc.lua