update
This commit is contained in:
Nydragon
parent
8a03b4415d
commit
ae593f7999
6 changed files with 122 additions and 49 deletions
|
|
@ -37,6 +37,8 @@ vim.o.cursorline = true
|
|||
-- Increase speed for terminals
|
||||
vim.o.ttyfast = true
|
||||
|
||||
vim.g.nvim_tree_respect_buf_cwd = 1
|
||||
|
||||
-- Highlight on yank (copy). It will do a nice highlight blink of the thing you just copied.
|
||||
vim.api.nvim_exec(
|
||||
[[
|
||||
|
|
@ -46,6 +48,26 @@ vim.api.nvim_exec(
|
|||
false
|
||||
)
|
||||
|
||||
--Set completeopt to have a better completion experience
|
||||
-- :help completeopt
|
||||
-- menuone: popup even when there's only one match
|
||||
-- noinsert: Do not insert text until a selection is made
|
||||
-- noselect: Do not select, force to select one from the menu
|
||||
-- shortness: avoid showing extra messages when using completion
|
||||
-- updatetime: set updatetime for CursorHold
|
||||
vim.opt.completeopt = { "menuone", "noselect", "noinsert" }
|
||||
vim.opt.shortmess = vim.opt.shortmess + { c = true }
|
||||
vim.api.nvim_set_option("updatetime", 300)
|
||||
|
||||
-- Fixed column for diagnostics to appear
|
||||
-- Show autodiagnostic popup on cursor hover_range
|
||||
-- Goto previous / next diagnostic warning / error
|
||||
-- Show inlay_hints more frequently
|
||||
vim.cmd([[
|
||||
set signcolumn=yes
|
||||
autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false })
|
||||
]])
|
||||
|
||||
-- Enable filetype plugins
|
||||
vim.cmd("filetype plugin on")
|
||||
|
||||
|
|
|
|||
|
|
@ -22,6 +22,9 @@ local function build()
|
|||
nix = {
|
||||
require("formatter.filetypes.nix").nixfmt,
|
||||
},
|
||||
c = {
|
||||
require("formatter.filetypes.c").clangformat,
|
||||
},
|
||||
["*"] = {
|
||||
require("formatter.filetypes.any").remove_trailing_whitespace,
|
||||
},
|
||||
|
|
|
|||
|
|
@ -7,54 +7,53 @@ end
|
|||
local cmp = require("cmp")
|
||||
|
||||
cmp.setup({
|
||||
-- Enable LSP snippets
|
||||
snippet = {
|
||||
-- REQUIRED - you must specify a snippet engine
|
||||
expand = function(args)
|
||||
vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
|
||||
-- require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
|
||||
-- require('snippy').expand_snippet(args.body) -- For `snippy` users.
|
||||
-- vim.fn["UltiSnips#Anon"](args.body) -- For `ultisnips` users.
|
||||
vim.fn["vsnip#anonymous"](args.body)
|
||||
end,
|
||||
},
|
||||
window = {
|
||||
-- completion = cmp.config.window.bordered(),
|
||||
-- documentation = cmp.config.window.bordered(),
|
||||
completion = cmp.config.window.bordered(),
|
||||
documentation = cmp.config.window.bordered(),
|
||||
},
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
["<C-Space>"] = cmp.mapping.confirm({
|
||||
mapping = {
|
||||
["<C-p>"] = cmp.mapping.select_prev_item(),
|
||||
["<C-n>"] = cmp.mapping.select_next_item(),
|
||||
-- Add tab support
|
||||
["<S-Tab>"] = cmp.mapping.select_prev_item(),
|
||||
["<Tab>"] = cmp.mapping.select_next_item(),
|
||||
["<C-S-f>"] = 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({
|
||||
behavior = cmp.ConfirmBehavior.Insert,
|
||||
select = true,
|
||||
}),
|
||||
|
||||
["<Tab>"] = function(fallback)
|
||||
if not cmp.select_next_item() then
|
||||
if vim.bo.buftype ~= "prompt" and has_words_before() then
|
||||
cmp.complete()
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end
|
||||
},
|
||||
sources = {
|
||||
{ name = "path" }, -- file paths
|
||||
{ name = "nvim_lsp", keyword_length = 3 }, -- from language server
|
||||
{ name = "nvim_lsp_signature_help" }, -- display function signatures with current parameter emphasized
|
||||
{ name = "nvim_lua", keyword_length = 2 }, -- complete neovim's Lua runtime API such vim.lsp.*
|
||||
{ name = "buffer", keyword_length = 2 }, -- source current buffer
|
||||
{ name = "vsnip", keyword_length = 2 }, -- nvim-cmp source for vim-vsnip
|
||||
{ name = "calc" }, -- source for math calculation
|
||||
},
|
||||
formatting = {
|
||||
fields = { "menu", "abbr", "kind" },
|
||||
format = function(entry, item)
|
||||
local menu_icon = {
|
||||
nvim_lsp = "λ",
|
||||
vsnip = "⋗",
|
||||
buffer = "Ω",
|
||||
path = "🖫",
|
||||
}
|
||||
item.menu = menu_icon[entry.source.name]
|
||||
return item
|
||||
end,
|
||||
|
||||
["<S-Tab>"] = function(fallback)
|
||||
if not cmp.select_prev_item() then
|
||||
if vim.bo.buftype ~= "prompt" and has_words_before() then
|
||||
cmp.complete()
|
||||
else
|
||||
fallback()
|
||||
end
|
||||
end
|
||||
end,
|
||||
}),
|
||||
sources = cmp.config.sources({
|
||||
{ name = "nvim_lsp" },
|
||||
{ name = "vsnip" }, -- For vsnip users.
|
||||
-- { name = 'luasnip' }, -- For luasnip users.
|
||||
-- { name = 'ultisnips' }, -- For ultisnips users.
|
||||
-- { name = 'snippy' }, -- For snippy users.
|
||||
}, {
|
||||
{ name = "buffer" },
|
||||
}),
|
||||
},
|
||||
})
|
||||
|
||||
-- Set configuration for specific filetype.
|
||||
|
|
|
|||
|
|
@ -44,3 +44,7 @@ require("lspconfig")["pyright"].setup({
|
|||
})
|
||||
|
||||
require("lspconfig").clangd.setup({})
|
||||
|
||||
require("lspconfig").rust_analyzer.setup({})
|
||||
|
||||
require("lspconfig").nixd.setup({})
|
||||
|
|
|
|||
|
|
@ -12,8 +12,19 @@ local function open_nvim_tree(data)
|
|||
return
|
||||
end
|
||||
|
||||
local path = data.file
|
||||
|
||||
if vim.fn.isdirectory(data.file) == 0 then
|
||||
_, _, i = path:find(".*()/.*")
|
||||
path = path:sub(0, i)
|
||||
end
|
||||
|
||||
-- open the tree, find the file but don't focus it
|
||||
require("nvim-tree.api").tree.toggle({ focus = false, find_file = true })
|
||||
require("nvim-tree.api").tree.toggle({
|
||||
focus = false,
|
||||
find_file = true,
|
||||
path = path,
|
||||
})
|
||||
end
|
||||
|
||||
vim.api.nvim_create_autocmd({ "VimEnter" }, { callback = open_nvim_tree })
|
||||
|
|
|
|||
|
|
@ -27,15 +27,6 @@ require("lazy").setup({
|
|||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"nvim-tree/nvim-tree.lua",
|
||||
dependencies = {
|
||||
"nvim-tree/nvim-web-devicons", -- optional, for file icons
|
||||
},
|
||||
init = function()
|
||||
require("nvim-tree-config")
|
||||
end,
|
||||
},
|
||||
{
|
||||
"romgrk/barbar.nvim",
|
||||
dependencies = {
|
||||
|
|
@ -82,7 +73,8 @@ require("lazy").setup({
|
|||
pickers = {
|
||||
find_files = {
|
||||
-- `hidden = true` will still show the inside of `.git/` as it's not `.gitignore`d.
|
||||
find_command = { "rg", "--files", "--hidden", "--no-ignore", "--glob", "!**/.git/*" },
|
||||
-- find_command = { "rg", "--files", "--hidden", "--no-ignore", "--glob", "!**/.git/*" },
|
||||
-- find_command = { "fd" },
|
||||
},
|
||||
},
|
||||
},
|
||||
|
|
@ -98,6 +90,7 @@ require("lazy").setup({
|
|||
"hrsh7th/cmp-cmdline",
|
||||
"hrsh7th/cmp-path",
|
||||
"hrsh7th/cmp-nvim-lua",
|
||||
"hrsh7th/cmp-nvim-lsp-signature-help",
|
||||
"hrsh7th/cmp-vsnip",
|
||||
},
|
||||
init = function()
|
||||
|
|
@ -128,3 +121,44 @@ autocmd("BufWritePost", {
|
|||
group = "__formatter__",
|
||||
command = ":FormatWrite",
|
||||
})
|
||||
|
||||
local rt = require("rust-tools")
|
||||
|
||||
rt.setup({
|
||||
server = {
|
||||
on_attach = function(_, bufnr)
|
||||
-- Hover actions
|
||||
vim.keymap.set("n", "<C-space>", rt.hover_actions.hover_actions, { buffer = bufnr })
|
||||
-- Code action groups
|
||||
vim.keymap.set("n", "<Leader>a", rt.code_action_group.code_action_group, { buffer = bufnr })
|
||||
end,
|
||||
},
|
||||
})
|
||||
|
||||
-- LSP Diagnostics Options Setup
|
||||
local sign = function(opts)
|
||||
vim.fn.sign_define(opts.name, {
|
||||
texthl = opts.name,
|
||||
text = opts.text,
|
||||
numhl = "",
|
||||
})
|
||||
end
|
||||
|
||||
vim.diagnostic.config({
|
||||
virtual_text = false,
|
||||
signs = true,
|
||||
update_in_insert = true,
|
||||
underline = true,
|
||||
severity_sort = false,
|
||||
float = {
|
||||
border = "rounded",
|
||||
source = "always",
|
||||
header = "",
|
||||
prefix = "",
|
||||
},
|
||||
})
|
||||
|
||||
vim.cmd([[
|
||||
set signcolumn=yes
|
||||
autocmd CursorHold * lua vim.diagnostic.open_float(nil, { focusable = false })
|
||||
]])
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue