nvim: Refactor plugins
This commit is contained in:
parent
8209624989
commit
8af57fc937
3 changed files with 572 additions and 665 deletions
670
neovim/init.lua
670
neovim/init.lua
|
|
@ -8,498 +8,13 @@ if not vim.loop.fs_stat(lazypath) then
|
|||
end
|
||||
vim.opt.rtp:prepend(lazypath)
|
||||
|
||||
plugins = {
|
||||
{ 'rktjmp/lush.nvim' },
|
||||
{
|
||||
"chrisbra/unicode.vim",
|
||||
lazy = false,
|
||||
dependencies = { "junegunn/fzf" },
|
||||
keys = {
|
||||
{ "<C-G><C-F>", "<Plug>(UnicodeFuzzy)<cr>", mode = "i" },
|
||||
},
|
||||
init = function()
|
||||
vim.g.Unicode_no_default_mappings = 1
|
||||
end,
|
||||
},
|
||||
{ "hrsh7th/cmp-nvim-lsp", branch = "main" },
|
||||
{ "hrsh7th/nvim-cmp", branch = "main" },
|
||||
{
|
||||
"junegunn/vim-easy-align",
|
||||
init = function()
|
||||
vim.keymap.set("x", "ga", "<Plug>(EasyAlign)")
|
||||
vim.keymap.set("n", "ga", "<Plug>(EasyAlign)")
|
||||
end,
|
||||
},
|
||||
{ "kylechui/nvim-surround", config = true},
|
||||
"L3MON4D3/LuaSnip",
|
||||
{
|
||||
"lewis6991/gitsigns.nvim",
|
||||
lazy = false,
|
||||
init = function()
|
||||
local gitsigns = require("gitsigns")
|
||||
|
||||
local toggle = function(value)
|
||||
-- Order matters here! If I toggle signs first (before blame),
|
||||
-- it seems like the blame gets an extra chance to render while
|
||||
-- it's being disabled, which leaves a ghost blame around
|
||||
-- forever. If I toggle blame first, it stays truly off and
|
||||
-- there aren't any ghost signs (or at least they're not
|
||||
-- obvious because the sign column goes away).
|
||||
gitsigns.toggle_current_line_blame(value)
|
||||
gitsigns.toggle_signs(value)
|
||||
end
|
||||
|
||||
vim.keymap.set("n", "<leader>g", toggle)
|
||||
vim.keymap.set("n", "]h", gitsigns.next_hunk)
|
||||
vim.keymap.set("n", "[h", gitsigns.prev_hunk)
|
||||
end,
|
||||
config = {
|
||||
signcolumn = false,
|
||||
signs = {
|
||||
add = { hl = 'GitSignsAdd' , text = '+', numhl='GitSignsAddNr' , linehl='GitSignsAddLn' },
|
||||
change = { hl = 'GitSignsChange', text = '~', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn' },
|
||||
delete = { hl = 'GitSignsDelete', text = '_', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn' },
|
||||
topdelete = { hl = 'GitSignsDelete', text = '‾', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn' },
|
||||
changedelete = { hl = 'GitSignsChange', text = '~', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn' },
|
||||
untracked = { hl = 'GitSignsAdd' , text = '+', numhl='GitSignsAddNr' , linehl='GitSignsAddLn' },
|
||||
},
|
||||
current_line_blame_formatter = ' <author> <author_time:%Y-%m-%d> <summary>',
|
||||
current_line_blame_opts = {
|
||||
virt_text = true,
|
||||
virt_text_pos = 'eol',
|
||||
delay = 500,
|
||||
ignore_whitespace = false,
|
||||
},
|
||||
},
|
||||
},
|
||||
"MarcWeber/vim-addon-local-vimrc",
|
||||
{
|
||||
"jose-elias-alvarez/null-ls.nvim",
|
||||
dependencies = {
|
||||
"neovim/nvim-lspconfig",
|
||||
"nvim-lua/plenary.nvim",
|
||||
},
|
||||
},
|
||||
"neovim/nvim-lspconfig",
|
||||
{
|
||||
"ntpeters/vim-better-whitespace",
|
||||
init = function()
|
||||
vim.g.better_whitespace_enabled = 1
|
||||
vim.g.better_whitespace_filetypes_blacklist = { 'diff' }
|
||||
vim.g.strip_whitespace_on_save = 1
|
||||
vim.g.strip_whitespace_confirm = 0
|
||||
vim.g.better_whitespace_operator = ''
|
||||
end,
|
||||
},
|
||||
{
|
||||
"preservim/nerdtree",
|
||||
keys = {
|
||||
{ "<leader>t", ":NERDTreeToggle<cr>" },
|
||||
{ "<leader>a", ":NERDTreeFind<cr>" },
|
||||
},
|
||||
},
|
||||
{
|
||||
"nvim-telescope/telescope.nvim",
|
||||
version = '^0.1.0',
|
||||
dependencies = {
|
||||
"nvim-lua/plenary.nvim",
|
||||
"nvim-telescope/telescope-fzf-native.nvim",
|
||||
"MunifTanjim/nui.nvim",
|
||||
"stevearc/aerial.nvim",
|
||||
},
|
||||
init = function()
|
||||
local telescope = require('telescope')
|
||||
telescope.load_extension('fzf')
|
||||
telescope.load_extension('aerial')
|
||||
|
||||
local builtin = require('telescope.builtin')
|
||||
|
||||
local function find_files(opts)
|
||||
opts = opts or {}
|
||||
opts['hidden'] = true
|
||||
return builtin.find_files(opts)
|
||||
end
|
||||
|
||||
vim.keymap.set('n', '<Space>f', find_files)
|
||||
vim.keymap.set('n', '<Space>g', builtin.live_grep)
|
||||
vim.keymap.set('n', '<Space>b', builtin.buffers)
|
||||
vim.keymap.set('n', '<Space>*', builtin.grep_string)
|
||||
vim.keymap.set('n', '<Space>o', telescope.extensions.aerial.aerial)
|
||||
|
||||
-- TODO: Delete these ; fake-leader bindings
|
||||
vim.keymap.set('n', ';f', find_files)
|
||||
vim.keymap.set('n', ';g', builtin.live_grep)
|
||||
vim.keymap.set('n', ';b', builtin.buffers)
|
||||
vim.keymap.set('n', ';*', builtin.grep_string)
|
||||
end,
|
||||
opts = function(_plugin, _config)
|
||||
local actions = require("telescope.actions")
|
||||
local action_state = require("telescope.actions.state")
|
||||
local transform_mod = require("telescope.actions.mt").transform_mod
|
||||
|
||||
-- https://github.com/nvim-telescope/telescope.nvim/issues/1048#issuecomment-1225975038
|
||||
local function multiopen(prompt_bufnr, method)
|
||||
local method = method or "default"
|
||||
|
||||
local edit_file_cmd_map = {
|
||||
vertical = "vsplit",
|
||||
horizontal = "split",
|
||||
tab = "tabedit",
|
||||
default = "edit",
|
||||
-- Load from ./lua/plugins/*.lua
|
||||
require("lazy").setup("plugins", {
|
||||
change_detection = {
|
||||
-- Disable automatic reloading of config files.
|
||||
enabled = false,
|
||||
}
|
||||
local edit_buf_cmd_map = {
|
||||
vertical = "vert sbuffer",
|
||||
horizontal = "sbuffer",
|
||||
tab = "tab sbuffer",
|
||||
default = "buffer",
|
||||
}
|
||||
|
||||
local picker = action_state.get_current_picker(prompt_bufnr)
|
||||
local multi_selection = picker:get_multi_selection()
|
||||
|
||||
if #multi_selection > 1 then
|
||||
require("telescope.pickers").on_close_prompt(prompt_bufnr)
|
||||
pcall(vim.api.nvim_set_current_win, picker.original_win_id)
|
||||
|
||||
for i, entry in ipairs(multi_selection) do
|
||||
local filename, row, col
|
||||
|
||||
if entry.path or entry.filename then
|
||||
filename = entry.path or entry.filename
|
||||
|
||||
row = entry.row or entry.lnum
|
||||
col = vim.F.if_nil(entry.col, 1)
|
||||
elseif not entry.bufnr then
|
||||
local value = entry.value
|
||||
if not value then
|
||||
goto continue
|
||||
end
|
||||
|
||||
if type(value) == "table" then
|
||||
value = entry.display
|
||||
end
|
||||
|
||||
local sections = vim.split(value, ":")
|
||||
|
||||
filename = sections[1]
|
||||
row = tonumber(sections[2])
|
||||
col = tonumber(sections[3])
|
||||
end
|
||||
|
||||
local entry_bufnr = entry.bufnr
|
||||
|
||||
if entry_bufnr then
|
||||
if not vim.api.nvim_buf_get_option(entry_bufnr, "buflisted") then
|
||||
vim.api.nvim_buf_set_option(entry_bufnr, "buflisted", true)
|
||||
end
|
||||
local command = i == 1 and "buffer" or edit_buf_cmd_map[method]
|
||||
pcall(vim.cmd, string.format("%s %s", command, vim.api.nvim_buf_get_name(entry_bufnr)))
|
||||
else
|
||||
local command = i == 1 and "edit" or edit_file_cmd_map[method]
|
||||
if vim.api.nvim_buf_get_name(0) ~= filename or command ~= "edit" then
|
||||
filename = require("plenary.path"):new(vim.fn.fnameescape(filename)):normalize(vim.loop.cwd())
|
||||
pcall(vim.cmd, string.format("%s %s", command, filename))
|
||||
end
|
||||
end
|
||||
|
||||
if row and col then
|
||||
pcall(vim.api.nvim_win_set_cursor, 0, { row, col-1 })
|
||||
end
|
||||
|
||||
::continue::
|
||||
end
|
||||
else
|
||||
actions["select_" .. method](prompt_bufnr)
|
||||
end
|
||||
end
|
||||
|
||||
return {
|
||||
defaults = {
|
||||
mappings = {
|
||||
i = {
|
||||
["<CR>"] = multiopen,
|
||||
},
|
||||
n = {
|
||||
["<CR>"] = multiopen,
|
||||
},
|
||||
},
|
||||
vimgrep_arguments = {
|
||||
"rg",
|
||||
"--color=never",
|
||||
"--no-heading",
|
||||
"--with-filename",
|
||||
"--line-number",
|
||||
"--column",
|
||||
"--smart-case",
|
||||
-- Include hidden files, but continue ignoring the .git directory itself.
|
||||
"--hidden",
|
||||
"--iglob", "!.git",
|
||||
},
|
||||
},
|
||||
pickers = {},
|
||||
extensions = {
|
||||
aerial = {},
|
||||
},
|
||||
}
|
||||
end,
|
||||
},
|
||||
{
|
||||
"nvim-telescope/telescope-fzf-native.nvim",
|
||||
build = "make",
|
||||
},
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter-textobjects",
|
||||
dependencies = { "nvim-treesitter/nvim-treesitter" },
|
||||
},
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
build = ":TSUpdate",
|
||||
init = function()
|
||||
require('nvim-treesitter.configs').setup({
|
||||
highlight = { enable = true },
|
||||
incremental_selection = { enable = true },
|
||||
|
||||
textobjects = {
|
||||
enable = true,
|
||||
select = {
|
||||
enable = true,
|
||||
|
||||
lookahead = true,
|
||||
|
||||
include_surrounding_whitespace = false,
|
||||
|
||||
-- https://github.com/nvim-treesitter/nvim-treesitter-textobjects#overriding-or-extending-textobjects
|
||||
keymaps = {
|
||||
["af"] = "@function.outer",
|
||||
["if"] = "@function.inner",
|
||||
["ac"] = "@comment.outer",
|
||||
["ic"] = "@comment.outer",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
ensure_installed = {
|
||||
"bash",
|
||||
"css",
|
||||
"dockerfile",
|
||||
"dot",
|
||||
"diff",
|
||||
"git_config",
|
||||
"git_rebase",
|
||||
"gitattributes",
|
||||
"gitcommit",
|
||||
"gitignore",
|
||||
"go",
|
||||
"gomod",
|
||||
"gosum",
|
||||
"gowork",
|
||||
"html",
|
||||
"javascript",
|
||||
"jq",
|
||||
"json",
|
||||
"lua",
|
||||
"markdown",
|
||||
"markdown_inline",
|
||||
"proto",
|
||||
"python",
|
||||
"ruby",
|
||||
"rust",
|
||||
"scss",
|
||||
"sql",
|
||||
"toml",
|
||||
"tsx",
|
||||
"typescript",
|
||||
"yaml",
|
||||
},
|
||||
})
|
||||
end,
|
||||
},
|
||||
"qpkorr/vim-bufkill",
|
||||
{
|
||||
"saadparwaiz1/cmp_luasnip",
|
||||
dependencies = { "L3MON4D3/LuaSnip" },
|
||||
},
|
||||
"simrat39/rust-tools.nvim",
|
||||
{
|
||||
"stevearc/aerial.nvim",
|
||||
dependencies = {
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
},
|
||||
opts = {},
|
||||
keys = {
|
||||
{ "<leader>m", "<cmd>AerialToggle<cr>" },
|
||||
{ "<leader>n", "<cmd>AerialNavToggle<cr>" },
|
||||
},
|
||||
},
|
||||
"tpope/vim-abolish",
|
||||
"tpope/vim-commentary",
|
||||
"tpope/vim-endwise",
|
||||
{
|
||||
"tpope/vim-fugitive",
|
||||
init = function()
|
||||
vim.keymap.set("", "<Space>G", ":Git<Space>")
|
||||
|
||||
-- TODO: Delete these ; fake-leader bindings
|
||||
vim.keymap.set("", ";G", ":Git<Space>")
|
||||
end,
|
||||
},
|
||||
"tpope/vim-repeat",
|
||||
{
|
||||
"wellle/context.vim",
|
||||
lazy = false,
|
||||
init = function()
|
||||
vim.g.context_enabled = 0
|
||||
vim.keymap.set("", "<leader>cc", ":ContextToggleWindow<CR>", { silent = true })
|
||||
vim.keymap.set("", "<leader>cp", ":ContextPeek<CR>", { silent = true })
|
||||
end,
|
||||
},
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
build = function(_plugin)
|
||||
require("mason-registry").refresh()
|
||||
end,
|
||||
config = true,
|
||||
},
|
||||
{
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
dependencies = { "williamboman/mason.nvim" },
|
||||
config = function(_plugin, opts)
|
||||
local mason_lspconfig = require("mason-lspconfig")
|
||||
mason_lspconfig.setup(opts)
|
||||
|
||||
local lsp_settings = {
|
||||
rust_analyzer = {
|
||||
["rust-analyzer"] = {
|
||||
checkOnSave = {
|
||||
command = "clippy",
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
local on_attach = function(client, bufno)
|
||||
local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufno, ...) end
|
||||
local function buf_set_option(...) vim.api.nvim_buf_set_option(bufno, ...) end
|
||||
|
||||
-- Enable completion through omnifunc, triggered by <C-x><C-o>
|
||||
buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
|
||||
|
||||
-- Mappings.
|
||||
local opts = { noremap=true, silent=true }
|
||||
|
||||
buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
|
||||
buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
|
||||
buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
|
||||
buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
|
||||
buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
|
||||
buf_set_keymap('n', '<Leader>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
|
||||
buf_set_keymap('n', '<Leader>R', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
|
||||
buf_set_keymap('n', '<Leader>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
|
||||
buf_set_keymap('v', '<Leader>ca', '<cmd>lua vim.lsp.buf.range_code_action()<CR>', opts)
|
||||
buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
|
||||
buf_set_keymap('n', '<Leader>d', '<cmd>lua vim.diagnostic.open_float()<CR>', opts)
|
||||
buf_set_keymap('n', '<Leader>j', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts)
|
||||
buf_set_keymap('n', '<Leader>k', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts)
|
||||
buf_set_keymap('n', '<Leader>q', '<cmd>lua vim.diagnostic.setloclist()<CR>', opts)
|
||||
|
||||
vim.api.nvim_command [[autocmd BufWritePre <buffer> lua vim.lsp.buf.format()]]
|
||||
end
|
||||
|
||||
local default_setup = function(server_name)
|
||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||
|
||||
require("lspconfig")[server_name].setup({
|
||||
on_attach = on_attach,
|
||||
settings = lsp_settings[server_name] or {},
|
||||
capabilities = capabilities,
|
||||
})
|
||||
end
|
||||
|
||||
mason_lspconfig.setup_handlers({
|
||||
-- This is the default handler for servers not named below.
|
||||
default_setup,
|
||||
|
||||
["rust_analyzer"] = function()
|
||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||
|
||||
-- rust-analyzer will be configured by rust-tools. Don't use lspconfig
|
||||
-- directly (or through the default setup) for this.
|
||||
require('rust-tools').setup({
|
||||
tools = {
|
||||
autoSetHints = true,
|
||||
hover_with_actions = false,
|
||||
inlay_hints = {
|
||||
only_current_line = true,
|
||||
-- Parameter hints are more annoying than useful here. Neovim can't show
|
||||
-- virtual text in the middle of the line like other editors do. It would
|
||||
-- mess with grid-based motion anyway.
|
||||
show_parameter_hints = false,
|
||||
parameter_hints_prefix = "",
|
||||
other_hints_prefix = "//",
|
||||
},
|
||||
},
|
||||
|
||||
server = {
|
||||
standalone = false,
|
||||
capabilities = capabilities,
|
||||
on_attach = on_attach,
|
||||
settings = lsp_settings.rust_analyzer,
|
||||
},
|
||||
})
|
||||
end,
|
||||
})
|
||||
end,
|
||||
},
|
||||
{
|
||||
"jay-babu/mason-null-ls.nvim",
|
||||
event = { "BufReadPre", "BufNewFile" },
|
||||
dependencies = {
|
||||
"jose-elias-alvarez/null-ls.nvim",
|
||||
"williamboman/mason.nvim",
|
||||
},
|
||||
init = function()
|
||||
local mason_null_ls = require("mason-null-ls")
|
||||
local null_ls = require("null-ls")
|
||||
|
||||
mason_null_ls.setup({
|
||||
handlers = {
|
||||
black = function(source_name, methods)
|
||||
null_ls.register(null_ls.builtins.formatting.black)
|
||||
|
||||
mason_null_ls.default_setup(source_name, methods)
|
||||
end,
|
||||
},
|
||||
})
|
||||
end,
|
||||
},
|
||||
{
|
||||
"windwp/nvim-autopairs",
|
||||
opts = {
|
||||
map_cr = true,
|
||||
enable_moveright = true,
|
||||
enable_check_bracket_line = false,
|
||||
check_ts = true,
|
||||
},
|
||||
config = function(_plugin, opts)
|
||||
local npairs = require("nvim-autopairs")
|
||||
local conds = require("nvim-autopairs.conds")
|
||||
npairs.setup(opts)
|
||||
|
||||
-- Allow Lisp tick-quotes. The non-Rust rule happens to be the
|
||||
-- first one.
|
||||
npairs.get_rules("'")[1].not_filetypes = { "clojure", "lisp", "scheme" }
|
||||
end,
|
||||
},
|
||||
{
|
||||
"almo7aya/openingh.nvim",
|
||||
keys = {
|
||||
{ "<Leader>gh", "V:OpenInGHFile<CR>", mode = {"n"} },
|
||||
{ "<Leader>gh", ":OpenInGHFile<CR>", mode = {"v"} },
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
require("lazy").setup(plugins)
|
||||
})
|
||||
|
||||
theme = "jdkaplan-temp"
|
||||
|
||||
|
|
@ -612,176 +127,3 @@ vim.keymap.set("n", "<C-l>", function()
|
|||
vim.cmd.colorscheme(theme)
|
||||
vim.cmd.redraw()
|
||||
end)
|
||||
|
||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||
|
||||
local nvim_lsp = require('lspconfig')
|
||||
local null_ls = require("null-ls")
|
||||
|
||||
local on_attach = function(client, bufno)
|
||||
local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufno, ...) end
|
||||
local function buf_set_option(...) vim.api.nvim_buf_set_option(bufno, ...) end
|
||||
|
||||
-- Enable completion through omnifunc, triggered by <C-x><C-o>
|
||||
buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
|
||||
|
||||
-- Mappings.
|
||||
local opts = { noremap=true, silent=true }
|
||||
|
||||
buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
|
||||
buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
|
||||
buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
|
||||
buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
|
||||
buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
|
||||
buf_set_keymap('n', '<Leader>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
|
||||
buf_set_keymap('n', '<Leader>R', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
|
||||
buf_set_keymap('n', '<Leader>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
|
||||
buf_set_keymap('v', '<Leader>ca', '<cmd>lua vim.lsp.buf.range_code_action()<CR>', opts)
|
||||
buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
|
||||
buf_set_keymap('n', '<Leader>d', '<cmd>lua vim.diagnostic.open_float()<CR>', opts)
|
||||
buf_set_keymap('n', '<Leader>j', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts)
|
||||
buf_set_keymap('n', '<Leader>k', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts)
|
||||
buf_set_keymap('n', '<Leader>q', '<cmd>lua vim.diagnostic.setloclist()<CR>', opts)
|
||||
|
||||
vim.api.nvim_command [[autocmd BufWritePre <buffer> lua vim.lsp.buf.format()]]
|
||||
end
|
||||
|
||||
local lsp_installer = require('nvim-lsp-installer')
|
||||
lsp_installer.setup({})
|
||||
|
||||
local lsp_settings = {
|
||||
gopls = {},
|
||||
rust_analyzer = {
|
||||
["rust-analyzer"] = {
|
||||
checkOnSave = {
|
||||
command = "clippy",
|
||||
},
|
||||
},
|
||||
},
|
||||
solargraph = {},
|
||||
tsserver = {},
|
||||
}
|
||||
|
||||
local null_ls_sources = {
|
||||
null_ls.builtins.formatting.black,
|
||||
-- Prettier is done with MunifTanjim/prettier.nvim which runs with
|
||||
-- project-local settings.
|
||||
}
|
||||
|
||||
-- In theory, this can be used for all languages. In practice, I just need this
|
||||
-- to pretend that gopls will run goimports for me.
|
||||
function goimports(wait_ms, opts)
|
||||
local bufnr = opts.bufnr or vim.api.nvim_get_current_buf()
|
||||
|
||||
local params = vim.lsp.util.make_range_params()
|
||||
params.context = {only = {"source.organizeImports"}}
|
||||
|
||||
local result = vim.lsp.buf_request_sync(bufnr, "textDocument/codeAction", params, wait_ms)
|
||||
for _, res in pairs(result or {}) do
|
||||
for _, r in pairs(res.result or {}) do
|
||||
if r.edit then
|
||||
vim.lsp.util.apply_workspace_edit(r.edit, "utf-8")
|
||||
else
|
||||
vim.lsp.buf.execute_command(r.command)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
for _, server in ipairs(lsp_installer.get_installed_servers()) do
|
||||
-- rust-analyzer will be configured by rust-tools.
|
||||
if server.name == 'rust_analyzer' then
|
||||
goto continue
|
||||
end
|
||||
|
||||
-- Go needs special logic to run goimports on save.
|
||||
if server.name == 'gopls' then
|
||||
vim.api.nvim_create_autocmd('BufWritePre', {
|
||||
pattern = '*.go',
|
||||
callback = function(...) goimports(1000, ...) end,
|
||||
})
|
||||
end
|
||||
|
||||
nvim_lsp[server.name].setup {
|
||||
on_attach = on_attach,
|
||||
settings = lsp_settings[server.name],
|
||||
capabilities = capabilities,
|
||||
}
|
||||
|
||||
null_ls.setup({
|
||||
on_attach = on_attach,
|
||||
sources = null_ls_sources,
|
||||
})
|
||||
|
||||
::continue::
|
||||
end
|
||||
|
||||
|
||||
require('rust-tools').setup({
|
||||
tools = {
|
||||
autoSetHints = true,
|
||||
hover_with_actions = false,
|
||||
inlay_hints = {
|
||||
only_current_line = true,
|
||||
-- Parameter hints are more annoying than useful here. Neovim can't show
|
||||
-- virtual text in the middle of the line like other editors do. It would
|
||||
-- mess with grid-based motion anyway.
|
||||
show_parameter_hints = false,
|
||||
parameter_hints_prefix = "",
|
||||
other_hints_prefix = "//",
|
||||
},
|
||||
},
|
||||
|
||||
server = {
|
||||
standalone = false,
|
||||
capabilities = capabilities,
|
||||
on_attach = on_attach,
|
||||
settings = lsp_settings.rust_analyzer,
|
||||
},
|
||||
})
|
||||
|
||||
local luasnip = require 'luasnip'
|
||||
|
||||
-- Put snippets in ./snippets/<filetype>.snippets
|
||||
require("luasnip.loaders.from_snipmate").lazy_load()
|
||||
|
||||
local cmp = require 'cmp'
|
||||
cmp.setup {
|
||||
completion = {
|
||||
autocomplete = false,
|
||||
},
|
||||
snippet = {
|
||||
expand = function(args) luasnip.lsp_expand(args.body) end,
|
||||
},
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
['<C-f>'] = cmp.mapping.scroll_docs(4),
|
||||
['<C-b>'] = cmp.mapping.scroll_docs(-4),
|
||||
['<C-Space>'] = cmp.mapping.complete(),
|
||||
['<CR>'] = cmp.mapping.confirm {
|
||||
behavior = cmp.ConfirmBehavior.Replace,
|
||||
select = true,
|
||||
},
|
||||
['<Tab>'] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_next_item()
|
||||
elseif luasnip.expand_or_jumpable() then
|
||||
luasnip.expand_or_jump()
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end, { 'i', 's' }),
|
||||
['<S-Tab>'] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_prev_item()
|
||||
elseif luasnip.jumpable(-1) then
|
||||
luasnip.jump(-1)
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end, { 'i', 's' }),
|
||||
}),
|
||||
sources = {
|
||||
{ name = "nvim_lsp" },
|
||||
{ name = "luasnip" },
|
||||
},
|
||||
}
|
||||
|
|
|
|||
76
neovim/lua/plugins/etc.lua
Normal file
76
neovim/lua/plugins/etc.lua
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
return {
|
||||
-- Theme
|
||||
'rktjmp/lush.nvim',
|
||||
|
||||
-- tpope extended universe
|
||||
"tpope/vim-abolish",
|
||||
"tpope/vim-commentary",
|
||||
"tpope/vim-endwise",
|
||||
"tpope/vim-repeat",
|
||||
{ "kylechui/nvim-surround", config = true },
|
||||
{
|
||||
"tpope/vim-fugitive",
|
||||
keys = {
|
||||
{ "<Space>G", ":Git<Space>", mode = "n" },
|
||||
},
|
||||
},
|
||||
|
||||
-- etc.
|
||||
"MarcWeber/vim-addon-local-vimrc",
|
||||
"qpkorr/vim-bufkill",
|
||||
{
|
||||
"almo7aya/openingh.nvim",
|
||||
keys = {
|
||||
{ "<Leader>gh", "V:OpenInGHFile<CR>", mode = {"n"} },
|
||||
{ "<Leader>gh", ":OpenInGHFile<CR>", mode = {"v"} },
|
||||
},
|
||||
},
|
||||
{
|
||||
"chrisbra/unicode.vim",
|
||||
lazy = false,
|
||||
dependencies = {
|
||||
"junegunn/fzf",
|
||||
},
|
||||
keys = {
|
||||
{ "<C-G><C-F>", "<Plug>(UnicodeFuzzy)<cr>", mode = "i" },
|
||||
},
|
||||
init = function()
|
||||
vim.g.Unicode_no_default_mappings = 1
|
||||
end,
|
||||
},
|
||||
{
|
||||
"junegunn/vim-easy-align",
|
||||
keys = {
|
||||
{ "ga", "<Plug>(EasyAlign)", mode = "x" },
|
||||
{ "ga", "<Plug>(EasyAlign)", mode = "n" },
|
||||
},
|
||||
},
|
||||
{
|
||||
"ntpeters/vim-better-whitespace",
|
||||
init = function()
|
||||
vim.g.better_whitespace_enabled = 1
|
||||
vim.g.better_whitespace_filetypes_blacklist = { 'diff' }
|
||||
vim.g.strip_whitespace_on_save = 1
|
||||
vim.g.strip_whitespace_confirm = 0
|
||||
vim.g.better_whitespace_operator = ''
|
||||
end,
|
||||
},
|
||||
{
|
||||
"windwp/nvim-autopairs",
|
||||
opts = {
|
||||
map_cr = true,
|
||||
enable_moveright = true,
|
||||
enable_check_bracket_line = false,
|
||||
check_ts = true,
|
||||
},
|
||||
config = function(_plugin, opts)
|
||||
local npairs = require("nvim-autopairs")
|
||||
local conds = require("nvim-autopairs.conds")
|
||||
npairs.setup(opts)
|
||||
|
||||
-- Allow Lisp tick-quotes. The non-Rust rule happens to be the
|
||||
-- first one.
|
||||
npairs.get_rules("'")[1].not_filetypes = { "clojure", "lisp", "scheme" }
|
||||
end,
|
||||
},
|
||||
}
|
||||
489
neovim/lua/plugins/ide.lua
Normal file
489
neovim/lua/plugins/ide.lua
Normal file
|
|
@ -0,0 +1,489 @@
|
|||
return {
|
||||
-- HUD
|
||||
{
|
||||
"preservim/nerdtree",
|
||||
keys = {
|
||||
{ "<leader>t", ":NERDTreeToggle<cr>" },
|
||||
{ "<leader>a", ":NERDTreeFind<cr>" },
|
||||
},
|
||||
},
|
||||
{
|
||||
"stevearc/aerial.nvim",
|
||||
dependencies = {
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
},
|
||||
keys = {
|
||||
{ "<leader>m", "<cmd>AerialToggle<cr>" },
|
||||
{ "<leader>n", "<cmd>AerialNavToggle<cr>" },
|
||||
},
|
||||
config =true,
|
||||
},
|
||||
{
|
||||
"wellle/context.vim",
|
||||
lazy = false,
|
||||
init = function()
|
||||
vim.g.context_enabled = 0
|
||||
vim.keymap.set("", "<leader>cc", ":ContextToggleWindow<CR>", { silent = true })
|
||||
vim.keymap.set("", "<leader>cp", ":ContextPeek<CR>", { silent = true })
|
||||
end,
|
||||
},
|
||||
{
|
||||
"lewis6991/gitsigns.nvim",
|
||||
lazy = false,
|
||||
init = function()
|
||||
local gitsigns = require("gitsigns")
|
||||
|
||||
local toggle = function(value)
|
||||
-- Order matters here! If I toggle signs first (before blame),
|
||||
-- it seems like the blame gets an extra chance to render while
|
||||
-- it's being disabled, which leaves a ghost blame around
|
||||
-- forever. If I toggle blame first, it stays truly off and
|
||||
-- there aren't any ghost signs (or at least they're not
|
||||
-- obvious because the sign column goes away).
|
||||
gitsigns.toggle_current_line_blame(value)
|
||||
gitsigns.toggle_signs(value)
|
||||
end
|
||||
|
||||
vim.keymap.set("n", "<leader>g", toggle)
|
||||
vim.keymap.set("n", "]h", gitsigns.next_hunk)
|
||||
vim.keymap.set("n", "[h", gitsigns.prev_hunk)
|
||||
end,
|
||||
config = {
|
||||
signcolumn = false,
|
||||
signs = {
|
||||
add = { hl = 'GitSignsAdd' , text = '+', numhl='GitSignsAddNr' , linehl='GitSignsAddLn' },
|
||||
change = { hl = 'GitSignsChange', text = '~', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn' },
|
||||
delete = { hl = 'GitSignsDelete', text = '_', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn' },
|
||||
topdelete = { hl = 'GitSignsDelete', text = '‾', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn' },
|
||||
changedelete = { hl = 'GitSignsChange', text = '~', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn' },
|
||||
untracked = { hl = 'GitSignsAdd' , text = '+', numhl='GitSignsAddNr' , linehl='GitSignsAddLn' },
|
||||
},
|
||||
current_line_blame_formatter = ' <author> <author_time:%Y-%m-%d> <summary>',
|
||||
current_line_blame_opts = {
|
||||
virt_text = true,
|
||||
virt_text_pos = 'eol',
|
||||
delay = 500,
|
||||
ignore_whitespace = false,
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
-- Treesitter
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
build = ":TSUpdate",
|
||||
init = function()
|
||||
require('nvim-treesitter.configs').setup({
|
||||
highlight = { enable = true },
|
||||
incremental_selection = { enable = true },
|
||||
|
||||
textobjects = {
|
||||
enable = true,
|
||||
select = {
|
||||
enable = true,
|
||||
|
||||
lookahead = true,
|
||||
|
||||
include_surrounding_whitespace = false,
|
||||
|
||||
-- https://github.com/nvim-treesitter/nvim-treesitter-textobjects#overriding-or-extending-textobjects
|
||||
keymaps = {
|
||||
["af"] = "@function.outer",
|
||||
["if"] = "@function.inner",
|
||||
["ac"] = "@comment.outer",
|
||||
["ic"] = "@comment.outer",
|
||||
},
|
||||
},
|
||||
},
|
||||
|
||||
ensure_installed = {
|
||||
"bash",
|
||||
"css",
|
||||
"dockerfile",
|
||||
"dot",
|
||||
"diff",
|
||||
"git_config",
|
||||
"git_rebase",
|
||||
"gitattributes",
|
||||
"gitcommit",
|
||||
"gitignore",
|
||||
"go",
|
||||
"gomod",
|
||||
"gosum",
|
||||
"gowork",
|
||||
"html",
|
||||
"javascript",
|
||||
"jq",
|
||||
"json",
|
||||
"lua",
|
||||
"markdown",
|
||||
"markdown_inline",
|
||||
"proto",
|
||||
"python",
|
||||
"ruby",
|
||||
"rust",
|
||||
"scss",
|
||||
"sql",
|
||||
"toml",
|
||||
"tsx",
|
||||
"typescript",
|
||||
"yaml",
|
||||
},
|
||||
})
|
||||
end,
|
||||
},
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter-textobjects",
|
||||
dependencies = {
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
},
|
||||
},
|
||||
|
||||
-- Telescope
|
||||
{
|
||||
"nvim-telescope/telescope.nvim",
|
||||
version = '^0.1.0',
|
||||
dependencies = {
|
||||
"nvim-lua/plenary.nvim",
|
||||
"nvim-telescope/telescope-fzf-native.nvim",
|
||||
"MunifTanjim/nui.nvim",
|
||||
"stevearc/aerial.nvim",
|
||||
},
|
||||
init = function()
|
||||
local telescope = require('telescope')
|
||||
telescope.load_extension('fzf')
|
||||
telescope.load_extension('aerial')
|
||||
|
||||
local builtin = require('telescope.builtin')
|
||||
|
||||
local function find_files(opts)
|
||||
opts = opts or {}
|
||||
opts['hidden'] = true
|
||||
return builtin.find_files(opts)
|
||||
end
|
||||
|
||||
vim.keymap.set('n', '<Space>f', find_files)
|
||||
vim.keymap.set('n', '<Space>g', builtin.live_grep)
|
||||
vim.keymap.set('n', '<Space>b', builtin.buffers)
|
||||
vim.keymap.set('n', '<Space>*', builtin.grep_string)
|
||||
vim.keymap.set('n', '<Space>o', telescope.extensions.aerial.aerial)
|
||||
|
||||
-- TODO: Delete these ; fake-leader bindings
|
||||
vim.keymap.set('n', ';f', find_files)
|
||||
vim.keymap.set('n', ';g', builtin.live_grep)
|
||||
vim.keymap.set('n', ';b', builtin.buffers)
|
||||
vim.keymap.set('n', ';*', builtin.grep_string)
|
||||
end,
|
||||
opts = function(_plugin, _config)
|
||||
local actions = require("telescope.actions")
|
||||
local action_state = require("telescope.actions.state")
|
||||
local transform_mod = require("telescope.actions.mt").transform_mod
|
||||
|
||||
-- https://github.com/nvim-telescope/telescope.nvim/issues/1048#issuecomment-1225975038
|
||||
local function multiopen(prompt_bufnr, method)
|
||||
local method = method or "default"
|
||||
|
||||
local edit_file_cmd_map = {
|
||||
vertical = "vsplit",
|
||||
horizontal = "split",
|
||||
tab = "tabedit",
|
||||
default = "edit",
|
||||
}
|
||||
local edit_buf_cmd_map = {
|
||||
vertical = "vert sbuffer",
|
||||
horizontal = "sbuffer",
|
||||
tab = "tab sbuffer",
|
||||
default = "buffer",
|
||||
}
|
||||
|
||||
local picker = action_state.get_current_picker(prompt_bufnr)
|
||||
local multi_selection = picker:get_multi_selection()
|
||||
|
||||
if #multi_selection > 1 then
|
||||
require("telescope.pickers").on_close_prompt(prompt_bufnr)
|
||||
pcall(vim.api.nvim_set_current_win, picker.original_win_id)
|
||||
|
||||
for i, entry in ipairs(multi_selection) do
|
||||
local filename, row, col
|
||||
|
||||
if entry.path or entry.filename then
|
||||
filename = entry.path or entry.filename
|
||||
|
||||
row = entry.row or entry.lnum
|
||||
col = vim.F.if_nil(entry.col, 1)
|
||||
elseif not entry.bufnr then
|
||||
local value = entry.value
|
||||
if not value then
|
||||
goto continue
|
||||
end
|
||||
|
||||
if type(value) == "table" then
|
||||
value = entry.display
|
||||
end
|
||||
|
||||
local sections = vim.split(value, ":")
|
||||
|
||||
filename = sections[1]
|
||||
row = tonumber(sections[2])
|
||||
col = tonumber(sections[3])
|
||||
end
|
||||
|
||||
local entry_bufnr = entry.bufnr
|
||||
|
||||
if entry_bufnr then
|
||||
if not vim.api.nvim_buf_get_option(entry_bufnr, "buflisted") then
|
||||
vim.api.nvim_buf_set_option(entry_bufnr, "buflisted", true)
|
||||
end
|
||||
local command = i == 1 and "buffer" or edit_buf_cmd_map[method]
|
||||
pcall(vim.cmd, string.format("%s %s", command, vim.api.nvim_buf_get_name(entry_bufnr)))
|
||||
else
|
||||
local command = i == 1 and "edit" or edit_file_cmd_map[method]
|
||||
if vim.api.nvim_buf_get_name(0) ~= filename or command ~= "edit" then
|
||||
filename = require("plenary.path"):new(vim.fn.fnameescape(filename)):normalize(vim.loop.cwd())
|
||||
pcall(vim.cmd, string.format("%s %s", command, filename))
|
||||
end
|
||||
end
|
||||
|
||||
if row and col then
|
||||
pcall(vim.api.nvim_win_set_cursor, 0, { row, col-1 })
|
||||
end
|
||||
|
||||
::continue::
|
||||
end
|
||||
else
|
||||
actions["select_" .. method](prompt_bufnr)
|
||||
end
|
||||
end
|
||||
|
||||
return {
|
||||
defaults = {
|
||||
mappings = {
|
||||
i = {
|
||||
["<CR>"] = multiopen,
|
||||
},
|
||||
n = {
|
||||
["<CR>"] = multiopen,
|
||||
},
|
||||
},
|
||||
vimgrep_arguments = {
|
||||
"rg",
|
||||
"--color=never",
|
||||
"--no-heading",
|
||||
"--with-filename",
|
||||
"--line-number",
|
||||
"--column",
|
||||
"--smart-case",
|
||||
-- Include hidden files, but continue ignoring the .git directory itself.
|
||||
"--hidden",
|
||||
"--iglob", "!.git",
|
||||
},
|
||||
},
|
||||
pickers = {},
|
||||
extensions = {
|
||||
aerial = {},
|
||||
},
|
||||
}
|
||||
end,
|
||||
},
|
||||
{
|
||||
"nvim-telescope/telescope-fzf-native.nvim",
|
||||
build = "make",
|
||||
},
|
||||
|
||||
-- Mason + LSP
|
||||
"simrat39/rust-tools.nvim",
|
||||
"neovim/nvim-lspconfig",
|
||||
{
|
||||
"jose-elias-alvarez/null-ls.nvim",
|
||||
dependencies = {
|
||||
"neovim/nvim-lspconfig",
|
||||
"nvim-lua/plenary.nvim",
|
||||
},
|
||||
},
|
||||
{
|
||||
"williamboman/mason.nvim",
|
||||
build = function(_plugin)
|
||||
require("mason-registry").refresh()
|
||||
end,
|
||||
config = true,
|
||||
},
|
||||
{
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
dependencies = {
|
||||
"neovim/nvim-lspconfig",
|
||||
"williamboman/mason.nvim",
|
||||
},
|
||||
config = function(_plugin, opts)
|
||||
local mason_lspconfig = require("mason-lspconfig")
|
||||
mason_lspconfig.setup(opts)
|
||||
|
||||
local lsp_settings = {
|
||||
rust_analyzer = {
|
||||
["rust-analyzer"] = {
|
||||
checkOnSave = {
|
||||
command = "clippy",
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
local on_attach = function(client, bufno)
|
||||
local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufno, ...) end
|
||||
local function buf_set_option(...) vim.api.nvim_buf_set_option(bufno, ...) end
|
||||
|
||||
-- Enable completion through omnifunc, triggered by <C-x><C-o>
|
||||
buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
|
||||
|
||||
-- Mappings.
|
||||
local opts = { noremap=true, silent=true }
|
||||
|
||||
buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
|
||||
buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
|
||||
buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
|
||||
buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
|
||||
buf_set_keymap('n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<CR>', opts)
|
||||
buf_set_keymap('n', '<Leader>D', '<cmd>lua vim.lsp.buf.type_definition()<CR>', opts)
|
||||
buf_set_keymap('n', '<Leader>R', '<cmd>lua vim.lsp.buf.rename()<CR>', opts)
|
||||
buf_set_keymap('n', '<Leader>ca', '<cmd>lua vim.lsp.buf.code_action()<CR>', opts)
|
||||
buf_set_keymap('v', '<Leader>ca', '<cmd>lua vim.lsp.buf.range_code_action()<CR>', opts)
|
||||
buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
|
||||
buf_set_keymap('n', '<Leader>d', '<cmd>lua vim.diagnostic.open_float()<CR>', opts)
|
||||
buf_set_keymap('n', '<Leader>j', '<cmd>lua vim.diagnostic.goto_next()<CR>', opts)
|
||||
buf_set_keymap('n', '<Leader>k', '<cmd>lua vim.diagnostic.goto_prev()<CR>', opts)
|
||||
buf_set_keymap('n', '<Leader>q', '<cmd>lua vim.diagnostic.setloclist()<CR>', opts)
|
||||
|
||||
vim.api.nvim_command [[autocmd BufWritePre <buffer> lua vim.lsp.buf.format()]]
|
||||
end
|
||||
|
||||
local default_setup = function(server_name)
|
||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||
|
||||
require("lspconfig")[server_name].setup({
|
||||
on_attach = on_attach,
|
||||
settings = lsp_settings[server_name] or {},
|
||||
capabilities = capabilities,
|
||||
})
|
||||
end
|
||||
|
||||
mason_lspconfig.setup_handlers({
|
||||
-- This is the default handler for servers not named below.
|
||||
default_setup,
|
||||
|
||||
["rust_analyzer"] = function()
|
||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||
|
||||
-- rust-analyzer will be configured by rust-tools. Don't use lspconfig
|
||||
-- directly (or through the default setup) for this.
|
||||
require('rust-tools').setup({
|
||||
tools = {
|
||||
autoSetHints = true,
|
||||
hover_with_actions = false,
|
||||
inlay_hints = {
|
||||
only_current_line = true,
|
||||
-- Parameter hints are more annoying than useful here. Neovim can't show
|
||||
-- virtual text in the middle of the line like other editors do. It would
|
||||
-- mess with grid-based motion anyway.
|
||||
show_parameter_hints = false,
|
||||
parameter_hints_prefix = "",
|
||||
other_hints_prefix = "//",
|
||||
},
|
||||
},
|
||||
|
||||
server = {
|
||||
standalone = false,
|
||||
capabilities = capabilities,
|
||||
on_attach = on_attach,
|
||||
settings = lsp_settings.rust_analyzer,
|
||||
},
|
||||
})
|
||||
end,
|
||||
})
|
||||
end,
|
||||
},
|
||||
{
|
||||
"jay-babu/mason-null-ls.nvim",
|
||||
event = { "BufReadPre", "BufNewFile" },
|
||||
dependencies = {
|
||||
"jose-elias-alvarez/null-ls.nvim",
|
||||
"williamboman/mason.nvim",
|
||||
},
|
||||
init = function()
|
||||
local mason_null_ls = require("mason-null-ls")
|
||||
local null_ls = require("null-ls")
|
||||
|
||||
mason_null_ls.setup({
|
||||
handlers = {
|
||||
black = function(source_name, methods)
|
||||
null_ls.register(null_ls.builtins.formatting.black)
|
||||
|
||||
mason_null_ls.default_setup(source_name, methods)
|
||||
end,
|
||||
},
|
||||
})
|
||||
end,
|
||||
},
|
||||
|
||||
-- Completion + snippets
|
||||
{ "hrsh7th/cmp-nvim-lsp", branch = "main" },
|
||||
{ "hrsh7th/nvim-cmp", branch = "main" },
|
||||
{
|
||||
"saadparwaiz1/cmp_luasnip",
|
||||
dependencies = {
|
||||
"L3MON4D3/LuaSnip",
|
||||
},
|
||||
},
|
||||
{
|
||||
"L3MON4D3/LuaSnip",
|
||||
dependencies = {
|
||||
"hrsh7th/nvim-cmp",
|
||||
"hrsh7th/cmp-nvim-lsp",
|
||||
},
|
||||
init = function()
|
||||
local luasnip = require('luasnip')
|
||||
|
||||
-- Put snippets in ./snippets/<filetype>.snippets
|
||||
require("luasnip.loaders.from_snipmate").lazy_load()
|
||||
|
||||
local cmp = require('cmp')
|
||||
cmp.setup {
|
||||
completion = {
|
||||
autocomplete = false,
|
||||
},
|
||||
snippet = {
|
||||
expand = function(args) luasnip.lsp_expand(args.body) end,
|
||||
},
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
['<C-f>'] = cmp.mapping.scroll_docs(4),
|
||||
['<C-b>'] = cmp.mapping.scroll_docs(-4),
|
||||
['<C-Space>'] = cmp.mapping.complete(),
|
||||
['<CR>'] = cmp.mapping.confirm {
|
||||
behavior = cmp.ConfirmBehavior.Replace,
|
||||
select = true,
|
||||
},
|
||||
['<Tab>'] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_next_item()
|
||||
elseif luasnip.expand_or_jumpable() then
|
||||
luasnip.expand_or_jump()
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end, { 'i', 's' }),
|
||||
['<S-Tab>'] = cmp.mapping(function(fallback)
|
||||
if cmp.visible() then
|
||||
cmp.select_prev_item()
|
||||
elseif luasnip.jumpable(-1) then
|
||||
luasnip.jump(-1)
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end, { 'i', 's' }),
|
||||
}),
|
||||
sources = {
|
||||
{ name = "nvim_lsp" },
|
||||
{ name = "luasnip" },
|
||||
},
|
||||
}
|
||||
end,
|
||||
},
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue