pull/339/head
Omixxx 2 years ago
parent 66954fc125
commit 46d493db65

@ -87,6 +87,7 @@ require('lazy').setup({
'neovim/nvim-lspconfig', 'neovim/nvim-lspconfig',
dependencies = { dependencies = {
-- Automatically install LSPs to stdpath for neovim -- Automatically install LSPs to stdpath for neovim
'williamboman/mason.nvim', 'williamboman/mason.nvim',
'williamboman/mason-lspconfig.nvim', 'williamboman/mason-lspconfig.nvim',
@ -170,7 +171,6 @@ require('lazy').setup({
end, end,
}, },
-- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart -- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart
-- These are some example plugins that I've included in the kickstart repository. -- These are some example plugins that I've included in the kickstart repository.
-- Uncomment any of the lines below to enable them. -- Uncomment any of the lines below to enable them.
@ -216,8 +216,6 @@ require('orgmode').setup({
vim.o.hlsearch = true vim.o.hlsearch = true
vim.cmd [[highlight Search guifg=#292e42 guibg=#bb9af7]] vim.cmd [[highlight Search guifg=#292e42 guibg=#bb9af7]]
-- Make line numbers default -- Make line numbers default
vim.wo.number = true vim.wo.number = true

@ -1,36 +1,34 @@
return { return {
{ 'kevinhwang91/nvim-ufo', { 'kevinhwang91/nvim-ufo',
dependecies = 'kevinhwang91/promise-async' }, dependecies = { 'kevinhwang91/promise-async' },
config = function() config = function()
vim.o.foldcolumn = '1' -- '0' is not bad vim.o.foldcolumn = "1" -- '0' is not bad
vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value vim.o.foldlevel = 99 -- Using ufo provider need a large value, feel free to decrease the value
vim.o.foldlevelstart = 99 vim.o.foldlevelstart = 99
vim.o.foldenable = true vim.o.foldenable = true
vim.opt.foldlevel = 20 vim.o.fillchars = [[eob: ,fold: ,foldopen:,foldsep: ,foldclose:]]
vim.opt.foldmethod = "expr"
vim.opt.foldexpr = "nvim_treesitter#foldexpr()"
-- Using ufo provider need remap `zR` and `zM`. If Neovim is 0.6.1, remap yourself -- Using ufo provider need remap `zR` and `zM`. If Neovim is 0.6.1, remap yourself
vim.keymap.set('n', 'zR', require('ufo').openAllFolds) vim.keymap.set('n', 'zR', require('ufo').openAllFolds)
vim.keymap.set('n', 'zM', require('ufo').closeAllFolds) vim.keymap.set('n', 'zM', require('ufo').closeAllFolds)
-- Option 2: nvim lsp as LSP client -- Option 2: nvim lsp as LSP client
-- Tell the server the capability of foldingRange, -- Tell the server the capability of foldingRange,
-- Neovim hasn't added foldingRange to default capabilities, users must add it manually -- Neovim hasn't added foldingRange to default capabilities, users must add it manually
local capabilities = vim.lsp.protocol.make_client_capabilities() local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities.textDocument.foldingRange = { capabilities.textDocument.foldingRange = {
dynamicRegistration = false, dynamicRegistration = false,
lineFoldingOnly = true lineFoldingOnly = true
} }
local language_servers = require("lspconfig").util.available_servers() -- or list servers manually like {'gopls', 'clangd'} local language_servers = require("lspconfig").util.available_servers() -- or list servers manually like {'gopls', 'clangd'}
for _, ls in ipairs(language_servers) do for _, ls in ipairs(language_servers) do
require('lspconfig')[ls].setup({ require('lspconfig')[ls].setup({
capabilities = capabilities capabilities = capabilities
-- you can add other fields for setting up lsp server in this table -- you can add other fields for setting up lsp server in this table
}) })
end end
require('ufo').setup() require('ufo').setup()
-- end,
end }
} }

Loading…
Cancel
Save