This commit is contained in:
QQ 2026-05-17 22:03:51 +08:00
parent 22dde69f49
commit b2a3bc393e
4 changed files with 64 additions and 40 deletions

View File

@ -1,43 +1,46 @@
G = require('G') 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 local lazypath = G.fn.stdpath("data") .. "/lazy/lazy.nvim"
G.fn.system({
"git", if not G.loop.fs_stat(lazypath) then
"clone", G.fn.system({
"--filter=blob:none", "git",
"https://github.com/folke/lazy.nvim.git", "clone",
"--branch=stable", "--filter=blob:none",
lazypath, "https://github.com/folke/lazy.nvim.git",
}) "--branch=stable",
lazypath,
})
G.fn.system({ G.fn.system({
"git", "git",
"config", "config",
"--global", "--global",
"credential.helper", "credential.helper",
"store", "store",
}) })
end end
G.opt.rtp:prepend(lazypath) G.opt.rtp:prepend(lazypath)
require("keymap") require("keymap")
if G.g.vscode then if G.g.vscode then
require('vscode') require('vscode')
else else
require("options") require("options")
local clone_prefix = G.use_ssh and "git@github.com:%s.git" or "https://github.com/%s.git" local clone_prefix = G.use_ssh and "git@github.com:%s.git" or "https://github.com/%s.git"
require("lazy").setup( require("lazy").setup(
require('plugs'), { require('plugs'), {
lockfile = G.fn.stdpath("data") .. "/lazy/lazy-lock.json", lockfile = G.fn.stdpath("data") .. "/lazy/lazy-lock.json",
git = { git = {
url_format = clone_prefix, url_format = clone_prefix,
}
} }
} )
) end
end end

View File

@ -23,6 +23,11 @@ return {
-- ft = { "go", 'gomod' }, -- ft = { "go", 'gomod' },
-- build = ':lua require("go.install").update_all_sync()' -- if you need to install/update all binaries -- 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', 'akinsho/toggleterm.nvim',

View File

@ -8,13 +8,29 @@ return {
config = function() config = function()
require 'neodev'.setup {} require 'neodev'.setup {}
require 'lspconfig'.lua_ls.setup(require('lsp.lua')) -- 定义需要启用的服务器列表及其对应的配置
require 'lspconfig'.clangd.setup(require('lsp.c')) local servers = {
require 'lspconfig'.bashls.setup(require('lsp.bash')) lua_ls = require('lsp.lua'),
require 'lspconfig'.basedpyright.setup(require('lsp.basedpyright')) clangd = require('lsp.c'),
require 'lspconfig'.yamlls.setup(require('lsp.yaml')) bashls = require('lsp.bash'),
require 'lspconfig'.gopls.setup(require('lsp.go')) basedpyright = require('lsp.basedpyright'),
require 'lspconfig'.jsonls.setup(require('lsp.json')) 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({ 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 require 'nvim-treesitter.install'.prefer_git = true
if G.use_ssh then if G.use_ssh then
local parsers = require 'nvim-treesitter.parsers'.get_parser_configs() local parsers = require 'nvim-treesitter.parsers'.get_parser_configs()