This commit is contained in:
QQ 2023-10-04 17:04:01 +08:00
parent 374ea7e318
commit 8ea69aaa53
8 changed files with 171 additions and 62 deletions

View File

@ -16,7 +16,3 @@ require('normal.normal')
-- require('Plugin.lualine') -- require('Plugin.lualine')
-- require('Plugin.Imchange') -- require('Plugin.Imchange')
-- require('Plugin.NERDTree') -- require('Plugin.NERDTree')

View File

@ -9,7 +9,7 @@ if [ -f /etc/lsb-release ]; then
# 安装nodejslsp 用得到) # 安装nodejslsp 用得到)
curl -sL https://deb.nodesource.com/setup_lts.x | bash - curl -sL https://deb.nodesource.com/setup_18.x | bash -
apt update && apt upgrade -y && apt install nodejs -y apt update && apt upgrade -y && apt install nodejs -y
else else

View File

@ -8,6 +8,8 @@ G.api = vim.api
G.opt = vim.opt G.opt = vim.opt
G.loop = vim.loop G.loop = vim.loop
G.lb = vim.lsp.buf G.lb = vim.lsp.buf
G.dic = vim.diagnostic
G.cgp = vim.nvim_create_augroup
function G.map(maps) function G.map(maps)
for _,map in pairs(maps) do for _,map in pairs(maps) do

View File

@ -1,5 +1,3 @@
local G = require('G')
-- 主题 -- 主题
G.cmd("colorscheme nord") G.cmd("colorscheme nord")

View File

@ -7,9 +7,9 @@ return {
'shaunsingh/nord.nvim', -- 主题插件 'shaunsingh/nord.nvim', -- 主题插件
require('neovim.plugsettings.coc'), -- coc
require('neovim.plugsettings.lualine'), -- lualine require('neovim.plugsettings.lualine'), -- lualine
require('neovim.plugsettings.nvimtree'), -- nvimtree require('neovim.plugsettings.nvimtree'), -- nvimtree
require('neovim.plugsettings.lspconfig'), -- lspconfig
require('neovim.plugsettings.treesitter'), -- treesitter require('neovim.plugsettings.treesitter'), -- treesitter
-- nerdtree -- nerdtree

View File

@ -0,0 +1,167 @@
return {
{
'neoclide/coc.nvim',
config = function()
G.opt.backup = false
G.opt.writebackup = false
G.opt.updatetime = 300
G.opt.signcolumn = "yes"
G.g.coc_global_extensions = {
'coc-pyright',
'coc-java',
'coc-lists',
'coc-pairs',
'coc-marketplace',
}
local opts = {
silent = true,
noremap = true,
expr = true,
replace_keycodes = false
}
G.map({
{ "i", "<TAB>", 'coc#pum#visible() ? coc#pum#next(1) : v:lua.check_back_space() ? "<TAB>" : coc#refresh()', opts },
{ "i", "<S-TAB>", [[coc#pum#visible() ? coc#pum#prev(1) : "\<C-h>"]], opts },
{ "i", "<cr>", [[coc#pum#visible() ? coc#pum#confirm() : "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"]], opts },
{ "n", "gd", "<Plug>(coc-definition)", {silent = true} },
{ "n", "gy", "<Plug>(coc-type-definition)", {silent = true} },
{ "n", "gi", "<Plug>(coc-implementation)", {silent = true} },
{ "n", "gr", "<Plug>(coc-references)", {silent = true} },
{ "n", "<leader>rn", "<Plug>(coc-rename)", {silent = true} },
{ "x", "<c-I>", "<Plug>(coc-format-selected)", {silent = true} },
{ "n", "<c-I>", "<Plug>(coc-format-selected)", {silent = true} },
})
local keyset = vim.keymap.set
function _G.check_back_space()
local col = G.fn.col('.') - 1
return col == 0 or vim.fn.getline('.'):sub(col, col):match('%s') ~= nil
end
keyset("n", "[g", "<Plug>(coc-diagnostic-prev)", {silent = true})
keyset("n", "]g", "<Plug>(coc-diagnostic-next)", {silent = true})
vim.api.nvim_create_augroup("CocGroup", {})
vim.api.nvim_create_autocmd("CursorHold", {
group = "CocGroup",
command = "silent call CocActionAsync('highlight')",
desc = "Highlight symbol under cursor on CursorHold"
})
vim.api.nvim_create_autocmd("FileType", {
group = "CocGroup",
pattern = "typescript,json",
command = "setl formatexpr=CocAction('formatSelected')",
desc = "Setup formatexpr specified filetype(s)."
})
-- Update signature help on jump placeholder
vim.api.nvim_create_autocmd("User", {
group = "CocGroup",
pattern = "CocJumpPlaceholder",
command = "call CocActionAsync('showSignatureHelp')",
desc = "Update signature help on jump placeholder"
})
-- Apply codeAction to the selected region
-- Example: `<leader>aap` for current paragraph
local opts = {silent = true, nowait = true}
keyset("x", "<leader>a", "<Plug>(coc-codeaction-selected)", opts)
keyset("n", "<leader>a", "<Plug>(coc-codeaction-selected)", opts)
-- Remap keys for apply code actions at the cursor position.
keyset("n", "<leader>ac", "<Plug>(coc-codeaction-cursor)", opts)
-- Remap keys for apply source code actions for current file.
keyset("n", "<leader>as", "<Plug>(coc-codeaction-source)", opts)
-- Apply the most preferred quickfix action on the current line.
keyset("n", "<leader>qf", "<Plug>(coc-fix-current)", opts)
-- Remap keys for apply refactor code actions.
keyset("n", "<leader>re", "<Plug>(coc-codeaction-refactor)", { silent = true })
keyset("x", "<leader>r", "<Plug>(coc-codeaction-refactor-selected)", { silent = true })
keyset("n", "<leader>r", "<Plug>(coc-codeaction-refactor-selected)", { silent = true })
-- Run the Code Lens actions on the current line
keyset("n", "<leader>cl", "<Plug>(coc-codelens-action)", opts)
-- Map function and class text objects
-- NOTE: Requires 'textDocument.documentSymbol' support from the language server
keyset("x", "if", "<Plug>(coc-funcobj-i)", opts)
keyset("o", "if", "<Plug>(coc-funcobj-i)", opts)
keyset("x", "af", "<Plug>(coc-funcobj-a)", opts)
keyset("o", "af", "<Plug>(coc-funcobj-a)", opts)
keyset("x", "ic", "<Plug>(coc-classobj-i)", opts)
keyset("o", "ic", "<Plug>(coc-classobj-i)", opts)
keyset("x", "ac", "<Plug>(coc-classobj-a)", opts)
keyset("o", "ac", "<Plug>(coc-classobj-a)", opts)
-- Remap <C-f> and <C-b> to scroll float windows/popups
---@diagnostic disable-next-line: redefined-local
local opts = {silent = true, nowait = true, expr = true}
keyset("n", "<C-f>", 'coc#float#has_scroll() ? coc#float#scroll(1) : "<C-f>"', opts)
keyset("n", "<C-b>", 'coc#float#has_scroll() ? coc#float#scroll(0) : "<C-b>"', opts)
keyset("i", "<C-f>",
'coc#float#has_scroll() ? "<c-r>=coc#float#scroll(1)<cr>" : "<Right>"', opts)
keyset("i", "<C-b>",
'coc#float#has_scroll() ? "<c-r>=coc#float#scroll(0)<cr>" : "<Left>"', opts)
keyset("v", "<C-f>", 'coc#float#has_scroll() ? coc#float#scroll(1) : "<C-f>"', opts)
keyset("v", "<C-b>", 'coc#float#has_scroll() ? coc#float#scroll(0) : "<C-b>"', opts)
-- Use CTRL-S for selections ranges
-- Requires 'textDocument/selectionRange' support of language server
keyset("n", "<C-s>", "<Plug>(coc-range-select)", {silent = true})
keyset("x", "<C-s>", "<Plug>(coc-range-select)", {silent = true})
-- Add `:Format` command to format current buffer
vim.api.nvim_create_user_command("Format", "call CocAction('format')", {})
-- " Add `:Fold` command to fold current buffer
vim.api.nvim_create_user_command("Fold", "call CocAction('fold', <f-args>)", {nargs = '?'})
-- Add `:OR` command for organize imports of the current buffer
vim.api.nvim_create_user_command("OR", "call CocActionAsync('runCommand', 'editor.action.organizeImport')", {})
-- Add (Neo)Vim's native statusline support
-- NOTE: Please see `:h coc-status` for integrations with external plugins that
-- provide custom statusline: lightline.vim, vim-airline
vim.opt.statusline:prepend("%{coc#status()}%{get(b:,'coc_current_function','')}")
-- Mappings for CoCList
-- code actions and coc stuff
---@diagnostic disable-next-line: redefined-local
local opts = {silent = true, nowait = true}
-- Show all diagnostics
keyset("n", "<space>a", ":<C-u>CocList diagnostics<cr>", opts)
-- Manage extensions
keyset("n", "<space>e", ":<C-u>CocList extensions<cr>", opts)
-- Show commands
keyset("n", "<space>c", ":<C-u>CocList commands<cr>", opts)
-- Find symbol of current document
keyset("n", "<space>o", ":<C-u>CocList outline<cr>", opts)
-- Search workspace symbols
keyset("n", "<space>s", ":<C-u>CocList -I symbols<cr>", opts)
-- Do default action for next item
keyset("n", "<space>j", ":<C-u>CocNext<cr>", opts)
-- Do default action for previous item
keyset("n", "<space>k", ":<C-u>CocPrev<cr>", opts)
-- Resume latest coc list
keyset("n", "<space>p", ":<C-u>CocListResume<cr>", opts)
end,
},
}

View File

@ -1,52 +0,0 @@
return {
{
'neovim/nvim-lspconfig',
config = function()
local lsp = require('lspconfig')
lsp.pyright.setup({})
-- lsp.lua_ls.setup{}
-- local opts = {buffer = ev.buf}
G.map({
-- G.lb = vim.lsp.buf
-- { 'n', 'gD', G.lb.declaration, opts},
-- { 'n', 'gd', G.lb.definition, opts},
-- { 'n', 'gi', G.lb.implementation, opts},
})
end,
},
{
'hrsh7th/nvim-cmp',
dependencies = {
'hrsh7th/cmp-cmdline',
'hrsh7th/cmp-path',
'hrsh7th/cmp-buffer',
'hrsh7th/cmp-nvim-lsp',
},
config = function()
require('cmp').setup{
sources = require('cmp').config.sources({
{ name = 'nvim_lsp' },
{ name = 'buffer' },
{ name = 'path' }
}),
}
end,
},
{
'williamboman/mason.nvim',
config = function()
require("mason").setup({
ui = {
icons = {
package_installed = "",
package_pending = "",
package_uninstalled = ""
}
}
})
end,
},
}

View File

@ -1,5 +1,3 @@
local G = require('G')
-- --
G.opt.ttimeout = true G.opt.ttimeout = true
G.opt.ttimeoutlen = 100 G.opt.ttimeoutlen = 100