nvim: Migrate configuration to lua and built-in plugin manager
This commit is contained in:
parent
9d31a63799
commit
6440203958
26 changed files with 453 additions and 616 deletions
|
|
@ -1,33 +1,22 @@
|
|||
return {
|
||||
"hrsh7th/nvim-cmp",
|
||||
lazy = true,
|
||||
event = "InsertEnter",
|
||||
dependencies = {
|
||||
"hrsh7th/cmp-buffer",
|
||||
"hrsh7th/cmp-path",
|
||||
},
|
||||
config = function()
|
||||
local cmp = require("cmp")
|
||||
vim.pack.add({
|
||||
gh("hrsh7th/nvim-cmp"),
|
||||
gh("hrsh7th/cmp-nvim-lsp"),
|
||||
gh("hrsh7th/cmp-buffer"),
|
||||
gh("hrsh7th/cmp-path"),
|
||||
})
|
||||
|
||||
cmp.setup({
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
["<C-d>"] = cmp.mapping.scroll_docs(-4),
|
||||
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
||||
["<C-Space>"] = cmp.mapping.complete(),
|
||||
["<C-e>"] = cmp.mapping.close(),
|
||||
-- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
|
||||
['<CR>'] = cmp.mapping.confirm({ select = false }),
|
||||
}),
|
||||
sources = cmp.config.sources({
|
||||
{ name = "nvim_lsp" },
|
||||
{ name = "buffer" },
|
||||
{ name = "path" },
|
||||
}),
|
||||
})
|
||||
|
||||
vim.cmd([[
|
||||
set completeopt=menuone,noinsert,noselect
|
||||
highlight! default link CmpItemKind CmpItemMenuDefault
|
||||
]])
|
||||
end,
|
||||
}
|
||||
local cmp = require("cmp")
|
||||
cmp.setup({
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
["<C-d>"] = cmp.mapping.scroll_docs(-4),
|
||||
["<C-f>"] = cmp.mapping.scroll_docs(4),
|
||||
["<C-Space>"] = cmp.mapping.complete(),
|
||||
["<C-e>"] = cmp.mapping.close(),
|
||||
['<CR>'] = cmp.mapping.confirm({ select = false }),
|
||||
}),
|
||||
sources = cmp.config.sources({
|
||||
{ name = "nvim_lsp" },
|
||||
{ name = "buffer" },
|
||||
{ name = "path" },
|
||||
}),
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
return {
|
||||
{
|
||||
"ellisonleao/gruvbox.nvim",
|
||||
priority = 1000 ,
|
||||
config = true,
|
||||
init = function()
|
||||
require("gruvbox").setup({
|
||||
contrast = "hard",
|
||||
hls_cursor = "red",
|
||||
})
|
||||
vim.cmd("colorscheme gruvbox")
|
||||
end
|
||||
}
|
||||
}
|
||||
|
|
@ -1,11 +1,5 @@
|
|||
return {
|
||||
"leoluz/nvim-dap-go",
|
||||
dependencies = {
|
||||
"https://codeberg.org/mfussenegger/nvim-dap",
|
||||
},
|
||||
lazy = true,
|
||||
ft = { "go" },
|
||||
config = function()
|
||||
require('dap-go').setup()
|
||||
end,
|
||||
}
|
||||
vim.pack.add({
|
||||
gh("leoluz/nvim-dap-go"),
|
||||
})
|
||||
|
||||
require('dap-go').setup()
|
||||
|
|
|
|||
|
|
@ -1,31 +0,0 @@
|
|||
return {
|
||||
"rcarriga/nvim-dap-ui",
|
||||
dependencies = {
|
||||
"nvim-neotest/nvim-nio",
|
||||
{
|
||||
"theHamsta/nvim-dap-virtual-text",
|
||||
opts = {},
|
||||
},
|
||||
},
|
||||
lazy = true,
|
||||
ft = { "java", "go", "python" },
|
||||
keys = {
|
||||
{ "<leader>du", function() require("dapui").toggle({ }) end, desc = "Dap UI" },
|
||||
{ "<leader>de", function() require("dapui").eval() end, desc = "Eval", mode = {"n", "v"} },
|
||||
},
|
||||
opts = {},
|
||||
config = function(_, opts)
|
||||
local dap = require("dap")
|
||||
local dapui = require("dapui")
|
||||
dapui.setup(opts)
|
||||
dap.listeners.after.event_initialized["dapui_config"] = function()
|
||||
dapui.open({})
|
||||
end
|
||||
dap.listeners.before.event_terminated["dapui_config"] = function()
|
||||
dapui.close({})
|
||||
end
|
||||
dap.listeners.before.event_exited["dapui_config"] = function()
|
||||
dapui.close({})
|
||||
end
|
||||
end,
|
||||
}
|
||||
|
|
@ -1,37 +1,20 @@
|
|||
return {
|
||||
"https://codeberg.org/mfussenegger/nvim-dap",
|
||||
lazy = true,
|
||||
ft = { "java", "go", "python" },
|
||||
dependencies = {
|
||||
"rcarriga/nvim-dap-ui",
|
||||
{
|
||||
"theHamsta/nvim-dap-virtual-text",
|
||||
opts = {},
|
||||
},
|
||||
},
|
||||
keys = {
|
||||
{ "<F11>", function() require("dap").continue() end, desc = "Continue" },
|
||||
{ "<F6>", function() require("dap").step_over() end, desc = "Step over" },
|
||||
{ "<F5>", function() require("dap").step_into() end, desc = "Step into" },
|
||||
{ "<F12>", function() require("dap").step_out() end, desc = "Step out" },
|
||||
{ "<space>b", function() require("dap").toggle_breakpoint() end, desc = "Toggle " },
|
||||
{ "<leader>d", "", desc = "+debug", mode = {"n", "v"} },
|
||||
{ "<leader>dB", function() require("dap").set_breakpoint(vim.fn.input('Breakpoint condition: ')) end, desc = "Breakpoint Condition" },
|
||||
{ "<leader>db", function() require("dap").toggle_breakpoint() end, desc = "Toggle Breakpoint" },
|
||||
{ "<leader>dc", function() require("dap").continue() end, desc = "Continue" },
|
||||
{ "<leader>da", function() require("dap").continue({ before = get_args }) end, desc = "Run with Args" },
|
||||
{ "<leader>dC", function() require("dap").run_to_cursor() end, desc = "Run to Cursor" },
|
||||
{ "<leader>dg", function() require("dap").goto_() end, desc = "Go to Line (No Execute)" },
|
||||
{ "<leader>di", function() require("dap").step_into() end, desc = "Step Into" },
|
||||
{ "<leader>dj", function() require("dap").down() end, desc = "Down" },
|
||||
{ "<leader>dk", function() require("dap").up() end, desc = "Up" },
|
||||
{ "<leader>dl", function() require("dap").run_last() end, desc = "Run Last" },
|
||||
{ "<leader>do", function() require("dap").step_out() end, desc = "Step Out" },
|
||||
{ "<leader>dO", function() require("dap").step_over() end, desc = "Step Over" },
|
||||
{ "<leader>dp", function() require("dap").pause() end, desc = "Pause" },
|
||||
{ "<leader>dr", function() require("dap").repl.toggle() end, desc = "Toggle REPL" },
|
||||
{ "<leader>ds", function() require("dap").session() end, desc = "Session" },
|
||||
{ "<leader>dt", function() require("dap").terminate() end, desc = "Terminate" },
|
||||
{ "<leader>dw", function() require("dap.ui.widgets").hover() end, desc = "Widgets" },
|
||||
},
|
||||
}
|
||||
vim.pack.add({
|
||||
cb("mfussenegger/nvim-dap"),
|
||||
gh("rcarriga/nvim-dap-ui"),
|
||||
gh("theHamsta/nvim-dap-virtual-text"),
|
||||
gh("rcarriga/nvim-dap-ui"),
|
||||
gh("nvim-neotest/nvim-nio"),
|
||||
})
|
||||
|
||||
local dap = require("dap")
|
||||
local dapui = require("dapui")
|
||||
dapui.setup(opts)
|
||||
dap.listeners.after.event_initialized["dapui_config"] = function()
|
||||
dapui.open({})
|
||||
end
|
||||
dap.listeners.before.event_terminated["dapui_config"] = function()
|
||||
dapui.close({})
|
||||
end
|
||||
dap.listeners.before.event_exited["dapui_config"] = function()
|
||||
dapui.close({})
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
return {
|
||||
"lewis6991/gitsigns.nvim",
|
||||
config = function()
|
||||
require("gitsigns").setup()
|
||||
end
|
||||
}
|
||||
vim.pack.add({
|
||||
gh("lewis6991/gitsigns.nvim"),
|
||||
})
|
||||
|
||||
require("gitsigns").setup()
|
||||
|
|
|
|||
8
nvim/lua/plugins/gruvbox.lua
Normal file
8
nvim/lua/plugins/gruvbox.lua
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
vim.pack.add({
|
||||
gh("ellisonleao/gruvbox.nvim"),
|
||||
})
|
||||
|
||||
require("gruvbox").setup({
|
||||
contrast = "hard",
|
||||
hls_cursor = "red",
|
||||
})
|
||||
|
|
@ -1,27 +1,3 @@
|
|||
return {
|
||||
"https://codeberg.org/mfussenegger/nvim-jdtls",
|
||||
lazy = true,
|
||||
ft = { "java" },
|
||||
config = function()
|
||||
local dap = require('dap')
|
||||
dap.configurations.java = {{
|
||||
type = 'java',
|
||||
request = 'attach',
|
||||
name = 'Debug (Attach) port 5005',
|
||||
hostName = '127.0.0.1',
|
||||
port = 5005,
|
||||
},{
|
||||
type = 'java',
|
||||
request = 'attach',
|
||||
name = 'Debug (Attach) port 5006',
|
||||
hostName = '127.0.0.1',
|
||||
port = 5006,
|
||||
},{
|
||||
type = 'java',
|
||||
request = 'attach',
|
||||
name = 'Debug (Attach) port 5105',
|
||||
hostName = '127.0.0.1',
|
||||
port = 5105,
|
||||
}}
|
||||
end,
|
||||
}
|
||||
vim.pack.add({
|
||||
cb("mfussenegger/nvim-jdtls"),
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,127 +1,3 @@
|
|||
return {
|
||||
"neovim/nvim-lspconfig",
|
||||
event = { "BufReadPre", "BufNewFile" },
|
||||
dependencies = {
|
||||
"hrsh7th/cmp-nvim-lsp",
|
||||
},
|
||||
keys = {
|
||||
{ "<space>e", vim.diagnostic.open_float },
|
||||
{ "[d", vim.diagnostic.goto_prev },
|
||||
{ "]d", vim.diagnostic.goto_next },
|
||||
{ "<space>q", vim.diagnostic.setloclist },
|
||||
{ "gD", vim.lsp.buf.declaration },
|
||||
{ "gd", vim.lsp.buf.definition },
|
||||
{ "K", vim.lsp.buf.hover },
|
||||
{ "gi", vim.lsp.buf.implementation },
|
||||
{ "<C-k>", vim.lsp.buf.signature_help },
|
||||
{ "<space>D", vim.lsp.buf.type_definition },
|
||||
{ "<space>rn", vim.lsp.buf.rename },
|
||||
{ "<space>ca", vim.lsp.buf.code_action },
|
||||
{ "gr", vim.lsp.buf.references },
|
||||
{
|
||||
"<space>f",
|
||||
function()
|
||||
vim.lsp.buf.format { async = true }
|
||||
end
|
||||
},
|
||||
},
|
||||
config = function()
|
||||
|
||||
local on_attach = function(client, bufnr)
|
||||
-- Format on save
|
||||
if client.server_capabilities.documentFormattingProvider then
|
||||
vim.api.nvim_create_autocmd("BufWritePre", {
|
||||
group = vim.api.nvim_create_augroup("Format", { clear = true }),
|
||||
buffer = bufnr,
|
||||
callback = function()
|
||||
vim.lsp.buf.format()
|
||||
end,
|
||||
})
|
||||
end
|
||||
end
|
||||
|
||||
-- Typos
|
||||
vim.lsp.config("typos_lsp", {
|
||||
settings = {
|
||||
filetypes = {
|
||||
'java',
|
||||
'go'
|
||||
},
|
||||
},
|
||||
init_options = {
|
||||
diagnosticSeverity = "Hint",
|
||||
}
|
||||
})
|
||||
|
||||
-- HTML
|
||||
vim.lsp.enable('html')
|
||||
|
||||
-- CSS
|
||||
vim.lsp.enable('cssls')
|
||||
|
||||
-- JSON
|
||||
vim.lsp.enable('jsonls')
|
||||
|
||||
-- Python
|
||||
vim.lsp.enable('pylsp')
|
||||
|
||||
-- Go
|
||||
vim.lsp.config("gopls", {
|
||||
settings = {
|
||||
gopls = {
|
||||
gofumpt = true,
|
||||
staticcheck = true,
|
||||
analyses = {
|
||||
unusedparams = true,
|
||||
unusedresult = true,
|
||||
unusedwrite = true,
|
||||
unusedvariable = true,
|
||||
useany = true,
|
||||
fieldalignment = false,
|
||||
nilness = true,
|
||||
shadow = true,
|
||||
},
|
||||
hints = {
|
||||
assignVariableTypes = true,
|
||||
compositeLiteralFields = true,
|
||||
compositeLiteralTypes = true,
|
||||
constantValues = true,
|
||||
functionTypeParameters = true,
|
||||
parameterNames = true,
|
||||
rangeVariableTypes = true,
|
||||
},
|
||||
codelenses = {
|
||||
gc_details = true,
|
||||
generate = true,
|
||||
regenerate_cgo = true,
|
||||
tidy = true,
|
||||
upgrade_dependency = true,
|
||||
vendor = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
-- Organize imports and format code on save
|
||||
vim.api.nvim_create_autocmd({"BufWritePre"}, {
|
||||
pattern = "*.go",
|
||||
callback = function()
|
||||
local params = vim.lsp.util.make_range_params()
|
||||
params.context = {only = {"source.organizeImports"}}
|
||||
local result = vim.lsp.buf_request_sync(0, "textDocument/codeAction", params)
|
||||
for cid, res in pairs(result or {}) do
|
||||
for _, r in pairs(res.result or {}) do
|
||||
if r.edit then
|
||||
local enc = (vim.lsp.get_client_by_id(cid) or {}).offset_encoding or "utf-16"
|
||||
vim.lsp.util.apply_workspace_edit(r.edit, enc)
|
||||
end
|
||||
end
|
||||
end
|
||||
vim.lsp.buf.format({async = false})
|
||||
end
|
||||
})
|
||||
vim.lsp.enable('gopls')
|
||||
|
||||
-- PHP
|
||||
vim.lsp.enable('phpactor')
|
||||
end,
|
||||
}
|
||||
vim.pack.add({
|
||||
gh("neovim/nvim-lspconfig"),
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
return {
|
||||
"nvim-lualine/lualine.nvim",
|
||||
dependencies = { "nvim-tree/nvim-web-devicons" },
|
||||
config = function()
|
||||
require("lualine").setup()
|
||||
end,
|
||||
}
|
||||
vim.pack.add({
|
||||
gh("nvim-lualine/lualine.nvim"),
|
||||
})
|
||||
|
||||
require("lualine").setup()
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
return {
|
||||
"nvim-neo-tree/neo-tree.nvim",
|
||||
branch = "v3.x",
|
||||
dependencies = {
|
||||
"nvim-lua/plenary.nvim",
|
||||
"nvim-tree/nvim-web-devicons",
|
||||
"MunifTanjim/nui.nvim",
|
||||
},
|
||||
keys = {
|
||||
{ "<leader>tt", "<cmd>Neotree toggle<cr>", desc = "NeoTree toggle" },
|
||||
{ "<leader>tr", "<cmd>Neotree reveal<cr>", desc = "NeoTree reveal" },
|
||||
},
|
||||
config = function()
|
||||
require("neo-tree").setup({
|
||||
window = {
|
||||
position = "left",
|
||||
width = 50,
|
||||
},
|
||||
})
|
||||
end
|
||||
}
|
||||
16
nvim/lua/plugins/neotree.lua
Normal file
16
nvim/lua/plugins/neotree.lua
Normal file
|
|
@ -0,0 +1,16 @@
|
|||
vim.pack.add({
|
||||
{
|
||||
src = gh("nvim-neo-tree/neo-tree.nvim"),
|
||||
version = vim.version.range("3")
|
||||
},
|
||||
gh("nvim-lua/plenary.nvim"),
|
||||
gh("MunifTanjim/nui.nvim"),
|
||||
gh("nvim-tree/nvim-web-devicons"),
|
||||
})
|
||||
|
||||
require("neo-tree").setup({
|
||||
window = {
|
||||
position = "left",
|
||||
width = 50,
|
||||
},
|
||||
})
|
||||
|
|
@ -1,38 +1,33 @@
|
|||
return {
|
||||
{
|
||||
url = "https://gitlab.com/schrieveslaach/sonarlint.nvim",
|
||||
lazy = true,
|
||||
ft = {"java", "go", "html", "python", "php"},
|
||||
config = function()
|
||||
require('sonarlint').setup({
|
||||
server = {
|
||||
cmd = {
|
||||
'sonarlint-ls',
|
||||
'-stdio',
|
||||
'-analyzers',
|
||||
"/usr/share/java/sonarlint-ls/analyzers/sonarjava.jar",
|
||||
"/usr/share/java/sonarlint-ls/analyzers/sonargo.jar",
|
||||
"/usr/share/java/sonarlint-ls/analyzers/sonarhtml.jar",
|
||||
"/usr/share/java/sonarlint-ls/analyzers/sonarpython.jar",
|
||||
"/usr/share/java/sonarlint-ls/analyzers/sonarphp.jar",
|
||||
},
|
||||
settings = {
|
||||
sonarlint = {
|
||||
test = "test",
|
||||
disableTelemetry = true,
|
||||
focusOnNewCode = true,
|
||||
showAnalyzerLogs = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
filetypes = {
|
||||
'java',
|
||||
'go',
|
||||
'html',
|
||||
'python',
|
||||
"php"
|
||||
},
|
||||
})
|
||||
end
|
||||
}
|
||||
}
|
||||
vim.pack.add({
|
||||
gl("schrieveslaach/sonarlint.nvim"),
|
||||
})
|
||||
|
||||
require('sonarlint').setup({
|
||||
server = {
|
||||
cmd = {
|
||||
'sonarlint-ls',
|
||||
'-stdio',
|
||||
'-analyzers',
|
||||
"/usr/share/java/sonarlint-ls/analyzers/sonarjava.jar",
|
||||
"/usr/share/java/sonarlint-ls/analyzers/sonargo.jar",
|
||||
"/usr/share/java/sonarlint-ls/analyzers/sonarhtml.jar",
|
||||
"/usr/share/java/sonarlint-ls/analyzers/sonarpython.jar",
|
||||
"/usr/share/java/sonarlint-ls/analyzers/sonarphp.jar",
|
||||
},
|
||||
settings = {
|
||||
sonarlint = {
|
||||
test = "test",
|
||||
disableTelemetry = true,
|
||||
focusOnNewCode = true,
|
||||
showAnalyzerLogs = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
filetypes = {
|
||||
'java',
|
||||
'go',
|
||||
'html',
|
||||
'python',
|
||||
"php"
|
||||
},
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,26 +1,12 @@
|
|||
return {
|
||||
'nvim-telescope/telescope.nvim',
|
||||
branch = '0.1.x',
|
||||
lazy = false,
|
||||
dependencies = {
|
||||
'nvim-lua/plenary.nvim',
|
||||
'nvim-telescope/telescope-ui-select.nvim',
|
||||
},
|
||||
keys = {
|
||||
{ "<C-p>", "<cmd>Telescope<cr>" },
|
||||
{ "<C-b>", "<cmd>Telescope buffers<cr>", desc = "Find luffers" },
|
||||
{ "<A-r>", "<cmd>Telescope git_files<CR>", desc = "Find files" },
|
||||
{ "<C-l>", "<cmd>Telescope lsp_document_symbols<CR>", desc = "Find symbols" },
|
||||
{ "<C-d>", "<cmd>lua require('telescope.builtin').diagnostics({severity_limit='WARN'})<CR>", desc = "Show errors and warnings" },
|
||||
},
|
||||
config = function()
|
||||
local t = require("telescope")
|
||||
t.setup({
|
||||
defaults = {
|
||||
preview = false,
|
||||
},
|
||||
})
|
||||
vim.pack.add({
|
||||
gh('nvim-telescope/telescope.nvim'),
|
||||
gh('nvim-telescope/telescope-ui-select.nvim'),
|
||||
gh("nvim-lua/plenary.nvim"),
|
||||
})
|
||||
|
||||
t.load_extension("ui-select")
|
||||
end
|
||||
}
|
||||
require("telescope").setup({
|
||||
defaults = {
|
||||
preview = false,
|
||||
},
|
||||
})
|
||||
require("telescope").load_extension("ui-select")
|
||||
|
|
|
|||
|
|
@ -1,8 +1,6 @@
|
|||
return {
|
||||
"folke/todo-comments.nvim",
|
||||
dependencies = {
|
||||
"nvim-lua/plenary.nvim",
|
||||
},
|
||||
opts = {
|
||||
},
|
||||
}
|
||||
vim.pack.add({
|
||||
gh("folke/todo-comments.nvim"),
|
||||
gh("nvim-lua/plenary.nvim"),
|
||||
})
|
||||
|
||||
require("todo-comments").setup()
|
||||
|
|
|
|||
|
|
@ -1,57 +1,75 @@
|
|||
return {
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
event = {
|
||||
"BufReadPre",
|
||||
"BufNewFile",
|
||||
},
|
||||
build = ":TSUpdate",
|
||||
config = function()
|
||||
local treesitter = require("nvim-treesitter.configs")
|
||||
vim.pack.add({
|
||||
gh("neovim-treesitter/nvim-treesitter"),
|
||||
})
|
||||
|
||||
treesitter.setup({
|
||||
highlight = {
|
||||
enable = true,
|
||||
additional_vim_regex_highlighting = false,
|
||||
},
|
||||
indent = {
|
||||
enable = true
|
||||
},
|
||||
autotag = {
|
||||
enable = true,
|
||||
},
|
||||
ensure_installed = {
|
||||
"json",
|
||||
"javascript",
|
||||
"yaml",
|
||||
"html",
|
||||
"css",
|
||||
"markdown",
|
||||
"markdown_inline",
|
||||
"bash",
|
||||
"lua",
|
||||
"vim",
|
||||
"gitignore",
|
||||
"go",
|
||||
},
|
||||
incremental_selection = {
|
||||
enable = true,
|
||||
keymaps = {
|
||||
init_selection = "<C-space>",
|
||||
node_incremental = "<C-space>",
|
||||
scope_incremental = false,
|
||||
node_decremental = "<bs>",
|
||||
},
|
||||
},
|
||||
rainbow = {
|
||||
enable = true,
|
||||
disable = { "html" },
|
||||
extended_mode = false,
|
||||
max_file_lines = nil,
|
||||
},
|
||||
context_commentstring = {
|
||||
enable = true,
|
||||
enable_autocmd = false,
|
||||
},
|
||||
})
|
||||
end,
|
||||
--require("nvim-treesitter.configs").setup({
|
||||
-- highlight = {
|
||||
-- enable = true,
|
||||
-- additional_vim_regex_highlighting = false,
|
||||
-- },
|
||||
-- indent = {
|
||||
-- enable = true
|
||||
-- },
|
||||
-- autotag = {
|
||||
-- enable = true,
|
||||
-- },
|
||||
-- ensure_installed = {
|
||||
-- "json",
|
||||
-- "javascript",
|
||||
-- "yaml",
|
||||
-- "html",
|
||||
-- "http",
|
||||
-- "css",
|
||||
-- "markdown",
|
||||
-- "markdown_inline",
|
||||
-- "bash",
|
||||
-- "lua",
|
||||
-- "vim",
|
||||
-- "gitignore",
|
||||
-- "go",
|
||||
-- },
|
||||
-- incremental_selection = {
|
||||
-- enable = true,
|
||||
-- keymaps = {
|
||||
-- init_selection = "<C-space>",
|
||||
-- node_incremental = "<C-space>",
|
||||
-- scope_incremental = false,
|
||||
-- node_decremental = "<bs>",
|
||||
-- },
|
||||
-- },
|
||||
-- rainbow = {
|
||||
-- enable = true,
|
||||
-- disable = { "html" },
|
||||
-- extended_mode = false,
|
||||
-- max_file_lines = nil,
|
||||
-- },
|
||||
-- context_commentstring = {
|
||||
-- enable = true,
|
||||
-- enable_autocmd = false,
|
||||
-- },
|
||||
--})
|
||||
require("nvim-treesitter").install {
|
||||
"fish",
|
||||
"lua",
|
||||
"gitcommit",
|
||||
"gitignore",
|
||||
"http",
|
||||
"html",
|
||||
"css",
|
||||
"javascript",
|
||||
"json",
|
||||
"yaml",
|
||||
"markdown",
|
||||
"markdown_inline",
|
||||
"go",
|
||||
}
|
||||
|
||||
vim.api.nvim_create_autocmd("FileType", {
|
||||
pattern = { "http", "html", "go" },
|
||||
callback = function()
|
||||
vim.treesitter.start()
|
||||
--vim.wo.foldexpr = "v:lua.vim.treesitter.foldexpr()"
|
||||
--vim.wo.foldmethod = "expr"
|
||||
vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()"
|
||||
end,
|
||||
})
|
||||
|
|
|
|||
|
|
@ -1,87 +1,4 @@
|
|||
return {
|
||||
"folke/trouble.nvim",
|
||||
opts = {}, -- for default options, refer to the configuration section for custom setup.
|
||||
cmd = "Trouble",
|
||||
keys = {
|
||||
{
|
||||
"<leader>xx",
|
||||
"<cmd>Trouble diagnostics toggle<cr>",
|
||||
desc = "Diagnostics (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>xX",
|
||||
"<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
|
||||
desc = "Buffer Diagnostics (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>xe",
|
||||
"<cmd>Trouble diagnostics filter.severity=vim.diagnostic.severity.ERROR<cr>",
|
||||
desc = "Error Diagnostics (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>xE",
|
||||
"<cmd>Trouble diagnostics filter.buf=0 filter.severity=vim.diagnostic.severity.ERROR<cr>",
|
||||
desc = "Error Diagnostics (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>xw",
|
||||
"<cmd>Trouble diagnostics filter.severity=vim.diagnostic.severity.WARN<cr>",
|
||||
desc = "Warning Diagnostics (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>xW",
|
||||
"<cmd>Trouble diagnostics filter.buf=0 filter.severity=vim.diagnostic.severity.WARN<cr>",
|
||||
desc = "Warning Diagnostics (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>xi",
|
||||
"<cmd>Trouble diagnostics filter.severity=vim.diagnostic.severity.INFO<cr>",
|
||||
desc = "Info Diagnostics (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>xI",
|
||||
"<cmd>Trouble diagnostics filter.buf=0 filter.severity=vim.diagnostic.severity.INFO<cr>",
|
||||
desc = "Info Diagnostics (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>xh",
|
||||
"<cmd>Trouble diagnostics filter.severity=vim.diagnostic.severity.HINT<cr>",
|
||||
desc = "Info Diagnostics (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>xH",
|
||||
"<cmd>Trouble diagnostics filter.buf=0 filter.severity=vim.diagnostic.severity.HINT<cr>",
|
||||
desc = "Info Diagnostics (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>xt",
|
||||
"<cmd>Trouble todo<cr>",
|
||||
desc = "TODOs (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>xT",
|
||||
"<cmd>Trouble todo filter.buf=0<cr>",
|
||||
desc = "TODOs (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>cs",
|
||||
"<cmd>Trouble symbols toggle focus=false<cr>",
|
||||
desc = "Symbols (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>cl",
|
||||
"<cmd>Trouble lsp toggle focus=false win.position=right<cr>",
|
||||
desc = "LSP Definitions / references / ... (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>xL",
|
||||
"<cmd>Trouble loclist toggle<cr>",
|
||||
desc = "Location List (Trouble)",
|
||||
},
|
||||
{
|
||||
"<leader>xQ",
|
||||
"<cmd>Trouble qflist toggle<cr>",
|
||||
desc = "Quickfix List (Trouble)",
|
||||
},
|
||||
},
|
||||
}
|
||||
vim.pack.add({
|
||||
gh("folke/trouble.nvim"),
|
||||
gh("nvim-tree/nvim-web-devicons"),
|
||||
})
|
||||
|
|
|
|||
11
nvim/lua/plugins/typos.lua
Normal file
11
nvim/lua/plugins/typos.lua
Normal file
|
|
@ -0,0 +1,11 @@
|
|||
vim.lsp.config("typos_lsp", {
|
||||
settings = {
|
||||
filetypes = {
|
||||
'java',
|
||||
'go'
|
||||
},
|
||||
},
|
||||
init_options = {
|
||||
diagnosticSeverity = "Hint",
|
||||
}
|
||||
})
|
||||
Loading…
Reference in a new issue