Add minor adjustments to neovim config
This commit is contained in:
parent
a08df1abf1
commit
0eedf92c14
10 changed files with 80 additions and 57 deletions
|
|
@ -47,6 +47,7 @@
|
||||||
"plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
|
"plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
|
||||||
"pretty-fold.nvim": { "branch": "master", "commit": "a7d8b424abe0eedf50116c460fbe6dfd5783b1d5" },
|
"pretty-fold.nvim": { "branch": "master", "commit": "a7d8b424abe0eedf50116c460fbe6dfd5783b1d5" },
|
||||||
"smart-splits.nvim": { "branch": "master", "commit": "c8a9173d70cbbd1f6e4a414e49e31df2b32a1362" },
|
"smart-splits.nvim": { "branch": "master", "commit": "c8a9173d70cbbd1f6e4a414e49e31df2b32a1362" },
|
||||||
|
"telescope-file-browser.nvim": { "branch": "master", "commit": "6e51d0cd6447cf2525412220ff0a2885eef9039c" },
|
||||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
|
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
|
||||||
"telescope.nvim": { "branch": "master", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" },
|
"telescope.nvim": { "branch": "master", "commit": "7011eaae0ac1afe036e30c95cf80200b8dc3f21a" },
|
||||||
"todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" },
|
"todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" },
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,8 @@ return {
|
||||||
event = "VeryLazy",
|
event = "VeryLazy",
|
||||||
keys = {
|
keys = {
|
||||||
{ "<leader>bp", "<Cmd>BufferLineTogglePin<CR>", desc = "Toggle pin" },
|
{ "<leader>bp", "<Cmd>BufferLineTogglePin<CR>", desc = "Toggle pin" },
|
||||||
{ "<leader>bP", "<Cmd>BufferLineGroupClose ungrouped<CR>", desc = "Delete non-pinned buffers" },
|
{ "<leader>bP", "<Cmd>BufferLineGroupClose ungrouped<CR>", desc = "Close non-pinned buffers" },
|
||||||
|
{ "<leader>bO", "<Cmd>BufferLineCloseOthers<CR>", desc = "Close non focused buffers" },
|
||||||
{ "<leader>bh", "<Cmd>BufferLineMovePrev<CR>", desc = "Move buffer to right" },
|
{ "<leader>bh", "<Cmd>BufferLineMovePrev<CR>", desc = "Move buffer to right" },
|
||||||
{ "<leader>bl", "<Cmd>BufferLineMoveNext<CR>", desc = "Move buffer to left" },
|
{ "<leader>bl", "<Cmd>BufferLineMoveNext<CR>", desc = "Move buffer to left" },
|
||||||
{ "<S-h>", "<cmd>BufferLineCyclePrev<cr>", desc = "Prev buffer" },
|
{ "<S-h>", "<cmd>BufferLineCyclePrev<cr>", desc = "Prev buffer" },
|
||||||
|
|
@ -14,8 +15,8 @@ return {
|
||||||
"echasnovski/mini.bufremove",
|
"echasnovski/mini.bufremove",
|
||||||
-- stylua: ignore
|
-- stylua: ignore
|
||||||
keys = {
|
keys = {
|
||||||
{ "<leader>bd", function() require("mini.bufremove").delete(0, false) end, desc = "Delete Buffer" },
|
{ "<leader>bc", function() require("mini.bufremove").delete(0, false) end, desc = "Close Buffer" },
|
||||||
{ "<leader>bD", function() require("mini.bufremove").delete(0, true) end, desc = "Delete Buffer (Force)" },
|
{ "<leader>bC", function() require("mini.bufremove").delete(0, true) end, desc = "Close Buffer (Force)" },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -19,16 +19,16 @@ return {
|
||||||
vim.keymap.set(mode, "<leader>g" .. l, r, { buffer = buffer, desc = desc })
|
vim.keymap.set(mode, "<leader>g" .. l, r, { buffer = buffer, desc = desc })
|
||||||
end
|
end
|
||||||
|
|
||||||
-- stylua: ignore start
|
-- stylua: ignore start
|
||||||
map("n", "j", gs.next_hunk, "Next Hunk")
|
map("n", "j", gs.next_hunk, "Next Hunk")
|
||||||
map("n", "k", gs.prev_hunk, "Prev Hunk")
|
map("n", "k", gs.prev_hunk, "Prev Hunk")
|
||||||
map({ "n", "v" }, "s", ":Gitsigns stage_hunk<CR>", "Stage Hunk")
|
map({ "n", "v" }, "s", ":Gitsigns stage_hunk<CR>", "Stage Hunk")
|
||||||
map({ "n", "v" }, "r", ":Gitsigns reset_hunk<CR>", "Reset Hunk")
|
map({ "n", "v" }, "r", ":Gitsigns reset_hunk<CR>", "Reset Hunk")
|
||||||
map("n", "u", gs.undo_stage_hunk, "Undo Stage Hunk")
|
map("n", "u", gs.undo_stage_hunk, "Undo Stage Hunk")
|
||||||
map("n", "R", gs.reset_buffer, "Reset Buffer")
|
map("n", "R", gs.reset_buffer, "Reset Buffer")
|
||||||
map("n", "p", gs.preview_hunk, "Preview Hunk")
|
map("n", "p", gs.preview_hunk, "Preview Hunk")
|
||||||
map("n", "l", function() gs.blame_line() end, "Blame Line")
|
map("n", "l", function() gs.blame_line() end, "Blame Line")
|
||||||
map("n", "d", gs.diffthis, "Diff This")
|
map("n", "d", gs.diffthis, "Diff This")
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -10,19 +10,6 @@ return {
|
||||||
dependencies = { "hrsh7th/cmp-nvim-lsp", "L3MON4D3/LuaSnip", "saadparwaiz1/cmp_luasnip" },
|
dependencies = { "hrsh7th/cmp-nvim-lsp", "L3MON4D3/LuaSnip", "saadparwaiz1/cmp_luasnip" },
|
||||||
},
|
},
|
||||||
|
|
||||||
{
|
|
||||||
"famiu/bufdelete.nvim",
|
|
||||||
config = nil,
|
|
||||||
keys = {
|
|
||||||
{
|
|
||||||
"<leader>bc",
|
|
||||||
function()
|
|
||||||
require("bufdelete").bufdelete(0, true)
|
|
||||||
end,
|
|
||||||
desc = "Close buffer",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"RRethy/vim-illuminate",
|
"RRethy/vim-illuminate",
|
||||||
event = { "BufReadPost", "BufNewFile" },
|
event = { "BufReadPost", "BufNewFile" },
|
||||||
|
|
|
||||||
|
|
@ -36,11 +36,6 @@ return {
|
||||||
|
|
||||||
-- Lesser used LSP functionality
|
-- Lesser used LSP functionality
|
||||||
nmap("gD", vim.lsp.buf.declaration, "Goto Declaration")
|
nmap("gD", vim.lsp.buf.declaration, "Goto Declaration")
|
||||||
nmap("<leader>wa", vim.lsp.buf.add_workspace_folder, "Workspace Add Folder")
|
|
||||||
nmap("<leader>wr", vim.lsp.buf.remove_workspace_folder, "Workspace Remove Folder")
|
|
||||||
nmap("<leader>wl", function()
|
|
||||||
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
|
||||||
end, "Workspace List Folders")
|
|
||||||
|
|
||||||
nmap("<leader>lj", vim.diagnostic.goto_next, "Go to next diagnostic")
|
nmap("<leader>lj", vim.diagnostic.goto_next, "Go to next diagnostic")
|
||||||
nmap("<leader>lk", vim.diagnostic.goto_prev, "Go to prev diagnostic")
|
nmap("<leader>lk", vim.diagnostic.goto_prev, "Go to prev diagnostic")
|
||||||
|
|
@ -52,6 +47,7 @@ return {
|
||||||
end
|
end
|
||||||
|
|
||||||
-- Enable the following language servers
|
-- Enable the following language servers
|
||||||
|
-- To see options and cofigurations: https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
|
||||||
local servers = {
|
local servers = {
|
||||||
bashls = {},
|
bashls = {},
|
||||||
cssls = {},
|
cssls = {},
|
||||||
|
|
@ -70,10 +66,22 @@ return {
|
||||||
},
|
},
|
||||||
yamlls = {},
|
yamlls = {},
|
||||||
lua_ls = {
|
lua_ls = {
|
||||||
settigns = {
|
settings = {
|
||||||
Lua = {
|
Lua = {
|
||||||
workspace = { checkThirdParty = false },
|
runtime = {
|
||||||
telemetry = { enable = false },
|
-- Tell the language server which version of Lua you're using
|
||||||
|
-- (most likely LuaJIT in the case of Neovim)
|
||||||
|
version = "LuaJIT",
|
||||||
|
},
|
||||||
|
-- Make the server aware of Neovim runtime files
|
||||||
|
workspace = {
|
||||||
|
checkThirdParty = false,
|
||||||
|
library = {
|
||||||
|
vim.env.VIMRUNTIME,
|
||||||
|
-- "${3rd}/luv/library"
|
||||||
|
-- "${3rd}/busted/library",
|
||||||
|
},
|
||||||
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
@ -128,5 +136,12 @@ return {
|
||||||
-- },
|
-- },
|
||||||
severity_sort = true,
|
severity_sort = true,
|
||||||
})
|
})
|
||||||
|
|
||||||
|
-- Customize gutter icons
|
||||||
|
local signs = require("aleidk.constants").icons.diagnostics
|
||||||
|
for type, icon in pairs(signs) do
|
||||||
|
local hl = "DiagnosticSign" .. type
|
||||||
|
vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
|
||||||
|
end
|
||||||
end,
|
end,
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,18 +10,18 @@ return {
|
||||||
history = true,
|
history = true,
|
||||||
delete_check_events = "TextChanged",
|
delete_check_events = "TextChanged",
|
||||||
},
|
},
|
||||||
-- stylua: ignore
|
-- stylua: ignore
|
||||||
keys = {
|
keys = {
|
||||||
{
|
{
|
||||||
"<tab>",
|
"<tab>",
|
||||||
function()
|
function()
|
||||||
return require("luasnip").jumpable(1) and "<Plug>luasnip-jump-next" or "<tab>"
|
return require("luasnip").jumpable(1) and "<Plug>luasnip-jump-next" or "<tab>"
|
||||||
end,
|
end,
|
||||||
expr = true,
|
expr = true,
|
||||||
silent = true,
|
silent = true,
|
||||||
mode = "i",
|
mode = "i",
|
||||||
},
|
},
|
||||||
{ "<tab>", function() require("luasnip").jump(1) end, mode = "s" },
|
{ "<tab>", function() require("luasnip").jump(1) end, mode = "s" },
|
||||||
{ "<s-tab>", function() require("luasnip").jump(-1) end, mode = { "i", "s" } },
|
{ "<s-tab>", function() require("luasnip").jump(-1) end, mode = { "i", "s" } },
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ return {
|
||||||
tree.setup({
|
tree.setup({
|
||||||
hijack_unnamed_buffer_when_opening = true,
|
hijack_unnamed_buffer_when_opening = true,
|
||||||
disable_netrw = true,
|
disable_netrw = true,
|
||||||
hijack_netrw = true,
|
hijack_netrw = false, -- handle by telescope browser
|
||||||
hijack_cursor = true, -- cursor at the start of filename
|
hijack_cursor = true, -- cursor at the start of filename
|
||||||
sync_root_with_cwd = true,
|
sync_root_with_cwd = true,
|
||||||
respect_buf_cwd = true,
|
respect_buf_cwd = true,
|
||||||
|
|
@ -31,7 +31,7 @@ return {
|
||||||
},
|
},
|
||||||
view = {
|
view = {
|
||||||
centralize_selection = true, -- center current file on enter
|
centralize_selection = true, -- center current file on enter
|
||||||
width = 30, -- N° of columns or %
|
width = 30, -- N° of columns or %
|
||||||
},
|
},
|
||||||
on_attach = function(bufnr)
|
on_attach = function(bufnr)
|
||||||
local function opts(desc)
|
local function opts(desc)
|
||||||
|
|
@ -79,6 +79,7 @@ return {
|
||||||
end
|
end
|
||||||
|
|
||||||
vim.api.nvim_create_autocmd({ "VimEnter" }, { callback = open_nvim_tree })
|
vim.api.nvim_create_autocmd({ "VimEnter" }, { callback = open_nvim_tree })
|
||||||
|
vim.api.nvim_create_user_command("Tree", "NvimTreeToggle", {})
|
||||||
|
|
||||||
-- bindings
|
-- bindings
|
||||||
-- disabled to discourage the use of this plugin without disabling it
|
-- disabled to discourage the use of this plugin without disabling it
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,9 @@ return {
|
||||||
return vim.fn.executable("make") == 1
|
return vim.fn.executable("make") == 1
|
||||||
end,
|
end,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"nvim-telescope/telescope-file-browser.nvim",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
config = function()
|
config = function()
|
||||||
local actions = require("telescope.actions")
|
local actions = require("telescope.actions")
|
||||||
|
|
@ -50,8 +53,15 @@ return {
|
||||||
|
|
||||||
-- Enable telescope fzf native, if installed
|
-- Enable telescope fzf native, if installed
|
||||||
pcall(telescope.load_extension, "fzf")
|
pcall(telescope.load_extension, "fzf")
|
||||||
|
pcall(telescope.load_extension, "file_browser")
|
||||||
|
|
||||||
-- Find files
|
-- Find files
|
||||||
|
vim.keymap.set(
|
||||||
|
"n",
|
||||||
|
"<leader>fe",
|
||||||
|
":Telescope file_browser path=%:p:h select_buffer=true<CR>",
|
||||||
|
{ desc = "File Explorer" }
|
||||||
|
)
|
||||||
vim.keymap.set("n", "<leader>fb", builtin.buffers, { desc = "Find buffers" })
|
vim.keymap.set("n", "<leader>fb", builtin.buffers, { desc = "Find buffers" })
|
||||||
vim.keymap.set("n", "<leader>ff", builtin.find_files, { desc = "Find files" })
|
vim.keymap.set("n", "<leader>ff", builtin.find_files, { desc = "Find files" })
|
||||||
vim.keymap.set("n", "<leader>fF", function()
|
vim.keymap.set("n", "<leader>fF", function()
|
||||||
|
|
@ -69,12 +79,13 @@ return {
|
||||||
vim.keymap.set("n", "<leader>fk", builtin.keymaps, { desc = "[F]ind [K]eymaps" })
|
vim.keymap.set("n", "<leader>fk", builtin.keymaps, { desc = "[F]ind [K]eymaps" })
|
||||||
|
|
||||||
-- Diagnosticos
|
-- Diagnosticos
|
||||||
vim.keymap.set("n", "<leader>fd", function()
|
-- Disabled, handle by trouble
|
||||||
builtin.diagnostics({ bufnr = 0 })
|
-- vim.keymap.set("n", "<leader>fD", function()
|
||||||
end, { desc = "Find diagnostics" })
|
-- builtin.diagnostics({ bufnr = 0 })
|
||||||
vim.keymap.set("n", "<leader>fD", function()
|
-- end, { desc = "Find diagnostics (Telescope)" })
|
||||||
builtin.diagnostics({ bufnr = nil })
|
-- vim.keymap.set("n", "<leader>fD", function()
|
||||||
end, { desc = "Find diagnostics in workspace" })
|
-- builtin.diagnostics({ bufnr = nil })
|
||||||
vim.keymap.set("n", "<leader>fz", builtin.spell_suggest, { desc = "Find spell suggestion" })
|
-- end, { desc = "Find diagnostics in workspace (Telescope)" })
|
||||||
|
-- vim.keymap.set("n", "<leader>fz", builtin.spell_suggest, { desc = "Find spell suggestion" })
|
||||||
end,
|
end,
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,6 +8,7 @@ return {
|
||||||
},
|
},
|
||||||
build = ":TSUpdate",
|
build = ":TSUpdate",
|
||||||
config = function()
|
config = function()
|
||||||
|
---@diagnostic disable-next-line: missing-fields
|
||||||
require("nvim-treesitter.configs").setup({
|
require("nvim-treesitter.configs").setup({
|
||||||
-- Add languages to be installed here that you want installed for treesitter
|
-- Add languages to be installed here that you want installed for treesitter
|
||||||
ensure_installed = {
|
ensure_installed = {
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,12 @@ return {
|
||||||
cmd = { "TroubleToggle", "Trouble" },
|
cmd = { "TroubleToggle", "Trouble" },
|
||||||
keys = {
|
keys = {
|
||||||
{ "<leader>fq", "<CMD>TroubleToggle<CR>", desc = "Toggle trouble" },
|
{ "<leader>fq", "<CMD>TroubleToggle<CR>", desc = "Toggle trouble" },
|
||||||
|
{ "<leader>fd", "<CMD>TroubleToggle workspace_diagnostics<CR>", desc = "Find diagnostics" },
|
||||||
|
{
|
||||||
|
"<leader>fD",
|
||||||
|
"<CMD>TroubleToggle document_diagnostics<CR>",
|
||||||
|
desc = "Find diagnostics in workspace",
|
||||||
|
},
|
||||||
},
|
},
|
||||||
config = function()
|
config = function()
|
||||||
require("trouble").setup({
|
require("trouble").setup({
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue