dqnid/nvim-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: major plugin cleanup

Browse Source
This commit is contained in:
Daniel Heras Quesada
2025-06-10 08:10:01 +02:00
parent e292595af3
commit 33aec2f252
11 changed files with 128 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@@ -9,6 +9,7 @@
This list is arbitrary and will depend on the current state of the lsp folder: This list is arbitrary and will depend on the current state of the lsp folder:
- `# pacman -S lua-language-server bash-language-server typescript-language-server vscode-html-language-server vscode-css-language-server pyright-langserver gopls astro-ls jdtls rust-analyzer solargraph vue-language-server vscode-json-languageserver` - `# pacman -S lua-language-server bash-language-server typescript-language-server vscode-html-language-server vscode-css-language-server pyright-langserver gopls astro-ls jdtls rust-analyzer solargraph vue-language-server vscode-json-languageserver`
- `$ yay -S jdtls ruby-solargraph`
- `# npm i -g emmet-language-server emmet-ls @astrojs/language-server` - `# npm i -g emmet-language-server emmet-ls @astrojs/language-server`
## Relevant docs ## Relevant docs

32
lazy-lock.json
View File

@@ -1,41 +1,29 @@
{ {
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
"LuaSnip": { "branch": "master", "commit": "faf3c94a44508cec1b961406d36cc65113ff3b98" }, "aerial.nvim": { "branch": "master", "commit": "5c0df1679bf7c814c924dc6646cc5291daca8363" },
"aerial.nvim": { "branch": "master", "commit": "2e00d1d4248f08dddfceacb8d2996e51e13e00f6" },
"auto-session": { "branch": "main", "commit": "00334ee24b9a05001ad50221c8daffbeedaa0842" }, "auto-session": { "branch": "main", "commit": "00334ee24b9a05001ad50221c8daffbeedaa0842" },
"autoclose.nvim": { "branch": "main", "commit": "b2077aa2c83df7ebc19b2a20a3a0654b24ae9c8f" }, "blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" },
"blueprints": { "branch": "main", "commit": "e5825c30464f98e77e8b5ffb88d59fd98df6c802" }, "blueprints": { "branch": "main", "commit": "e5825c30464f98e77e8b5ffb88d59fd98df6c802" },
"bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
"cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "conform.nvim": { "branch": "master", "commit": "8132ec733eed3bf415b97b76797ca41b59f51d7d" },
"cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" },
"cmp-emoji": { "branch": "main", "commit": "e8398e2adf512a03bb4e1728ca017ffeac670a9f" },
"cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
"cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
"conform.nvim": { "branch": "master", "commit": "6feb2f28f9a9385e401857b21eeac3c1b66dd628" },
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
"flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" }, "flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, "gitsigns.nvim": { "branch": "main", "commit": "d0f90ef51d4be86b824b012ec52ed715b5622e51" },
"gitsigns.nvim": { "branch": "main", "commit": "8bdaccdb897945a3c99c1ad8df94db0ddf5c8790" },
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
"lualine.nvim": { "branch": "master", "commit": "0c6cca9f2c63dadeb9225c45bc92bb95a151d4af" }, "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
"neo-tree.nvim": { "branch": "main", "commit": "3f1dd2de5045659e00bfbe27c8aca3b52c1fdbde" }, "mini.icons": { "branch": "main", "commit": "397ed3807e96b59709ef3292f0a3e253d5c1dc0a" },
"no-neck-pain.nvim": { "branch": "main", "commit": "c824c54d837160ac32d0f877574ccfa2ecce9947" }, "neo-tree.nvim": { "branch": "main", "commit": "e01ca7de8e6dbc6118bcb12c4cbe1f88162a337f" },
"no-neck-pain.nvim": { "branch": "main", "commit": "ecdfe60f23134089fac92659e688b65fdd8b5cc0" },
"noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
"nui.nvim": { "branch": "main", "commit": "7cd18e73cfbd70e1546931b7268b3eebaeff9391" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
"nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
"nvim-lspconfig": { "branch": "master", "commit": "b8e7957bde4cbb3cb25a13a62548f7c273b026e9" },
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
"nvim-treesitter-context": { "branch": "master", "commit": "ed1cf48d5af252248c55f50b9427e8ce883a2c6b" },
"nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
"nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
"nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" }, "nvim-window-picker": { "branch": "main", "commit": "6382540b2ae5de6c793d4aa2e3fe6dbb518505ec" },
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
"scope.nvim": { "branch": "main", "commit": "6b4208f017da9b122d69ddc5841e040dffe7313c" }, "scope.nvim": { "branch": "main", "commit": "6b4208f017da9b122d69ddc5841e040dffe7313c" },
"smear-cursor.nvim": { "branch": "main", "commit": "162703638203060b1d3412e73429d232bbd2627e" }, "smear-cursor.nvim": { "branch": "main", "commit": "aff844fc1483fd673f721a41affcd7e2fcb885f5" },
"snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
"telescope-git-file-history.nvim": { "branch": "master", "commit": "e7d495319f2a04df96402057a6992ea970f8914d" }, "telescope-git-file-history.nvim": { "branch": "master", "commit": "e7d495319f2a04df96402057a6992ea970f8914d" },
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },

5
lua/config/autocmds.lua
View File

@@ -1,4 +1,6 @@
vim.api.nvim_create_autocmd("ModeChanged", { local autocmd = vim.api.nvim_create_autocmd
autocmd("ModeChanged", {
callback = function(opts) callback = function(opts)
require("lualine").refresh() require("lualine").refresh()
end, end,
@@ -8,4 +10,3 @@ vim.api.nvim_create_autocmd("CursorMoved", {
require("lualine").refresh() require("lualine").refresh()
end, end,
}) })

2
lua/config/init.lua
View File

@@ -1,4 +1,4 @@
require("config.lsp")
require("config.autocmds") require("config.autocmds")
require("config.remap") require("config.remap")
require("config.lazy") require("config.lazy")
require("config.lsp")

11
lua/config/remap.lua
View File

@@ -2,11 +2,9 @@ vim.g.mapleader = " "
local map = vim.keymap.set local map = vim.keymap.set
---- Bufferline ---- ---- Bufferline ----
map("n", "bg", "<CMD>BufferLinePick<CR>") map("n", "bg", "<CMD>BufferLinePick<CR>")
map("n", "<leader>bpx", "<CMD>BufferLinePickClose<CR>") map("n", "<leader>bpx", "<CMD>BufferLinePickClose<CR>")
map("n", "<leader>box", "<CMD>BufferLineCloseOthers<CR>") map("n", "<leader>box", "<CMD>BufferLineCloseOthers<CR>") map("n", "<Tab>", "<CMD>BufferLineCycleNext<CR>")
map("n", "<Tab>", "<CMD>BufferLineCycleNext<CR>")
map("n", "<S-Tab>", "<CMD>BufferLineCyclePrev<CR>") map("n", "<S-Tab>", "<CMD>BufferLineCyclePrev<CR>")
map("n", "bsd", "<CMD>BufferLineSortByDirectory<CR>") map("n", "bsd", "<CMD>BufferLineSortByDirectory<CR>")
map("n", "bse", "<CMD>BufferLineSortByExtension<CR>") map("n", "bse", "<CMD>BufferLineSortByExtension<CR>")
@@ -18,17 +16,14 @@ map("n", "<S-l>", "<cmd>BufferLineMoveNext<cr>", { desc = "Move buffer to right"
map("n", "[b", "<cmd>bprevious<cr>", { desc = "Prev Buffer" }) map("n", "[b", "<cmd>bprevious<cr>", { desc = "Prev Buffer" })
map("n", "]b", "<cmd>bnext<cr>", { desc = "Next Buffer" }) map("n", "]b", "<cmd>bnext<cr>", { desc = "Next Buffer" })
map("n", "<leader>bd", function() map("n", "<leader>bd", function()
Snacks.bufdelete() -- Snacks.bufdelete()
end, { desc = "Delete Buffer" })
map("n", "<leader>x", function()
Snacks.bufdelete()
end, { desc = "Delete Buffer" }) end, { desc = "Delete Buffer" })
-- cant have C-w to delete buffer since in being used to navigate windows -- cant have C-w to delete buffer since in being used to navigate windows
-- map("n", "<C-w>", function() -- map("n", "<C-w>", function()
-- Snacks.bufdelete() -- Snacks.bufdelete()
-- end, { desc = "Go to Left Window", remap = true }) -- end, { desc = "Go to Left Window", remap = true })
map("n", "<C-x>", function() map("n", "<C-x>", function()
Snacks.bufdelete() -- Snacks.bufdelete()
end, { desc = "Delete Buffer" }) end, { desc = "Delete Buffer" })
map("n", "<leader>bD", "<cmd>:bd<cr>", { desc = "Delete Buffer and Window" }) map("n", "<leader>bD", "<cmd>:bd<cr>", { desc = "Delete Buffer and Window" })
-- tabpages -- tabpages

109
lua/plugins/code-utils.lua
View File

@@ -14,65 +14,68 @@ return {
}, },
-- To test if TreeSitter is working -- To test if TreeSitter is working
-- "nvim-treesitter/playground", -- "nvim-treesitter/playground",
{ -- {
"nvim-treesitter/nvim-treesitter-context", -- "nvim-treesitter/nvim-treesitter-context",
opts = function() -- opts = function()
return require("plugins.opts.treesitterContext") -- return require("plugins.opts.treesitterContext")
end, -- end,
}, -- },
-- │ Completion │ -- │ Completion │
{ {
"hrsh7th/nvim-cmp", 'saghen/blink.cmp',
enabled = true, -- dependencies = { 'rafamadriz/friendly-snippets' },
dependencies = { version = '1.*',
"hrsh7th/cmp-emoji",
"hrsh7th/cmp-buffer",
"hrsh7th/cmp-emoji",
"hrsh7th/cmp-nvim-lsp",
"hrsh7th/cmp-cmdline",
"hrsh7th/cmp-path",
},
opts = function()
return require("plugins.opts.cmp")
end,
},
{
"L3MON4D3/LuaSnip",
build = "make install_jsregexp",
dependencies = { "rafamadriz/friendly-snippets" },
},
{
"saadparwaiz1/cmp_luasnip",
dependencies = {
"hrsh7th/nvim-cmp",
},
},
-- │ Auto close │
{
"m4xshen/autoclose.nvim",
},
{
"windwp/nvim-ts-autotag",
config = function(_, opts)
require('nvim-ts-autotag').setup({
opts = { opts = {
enable_close = true, -- Auto close tags -- All presets have the following mappings:
enable_rename = true, -- Auto rename pairs of tags -- C-space: Open menu or open docs if already open
enable_close_on_slash = false -- Auto close on trailing </ -- C-n/C-p or Up/Down: Select next/previous item
-- C-e: Hide menu
-- C-k: Toggle signature help (if signature.enabled = true)
keymap = { preset = 'default' },
appearance = {
nerd_font_variant = 'mono'
}, },
per_filetype = { -- (Default) Only show the documentation popup when manually triggered
["html"] = { completion = { documentation = { auto_show = false } },
enable_close = true -- Default list of enabled providers defined so that you can extend it
} -- elsewhere in your config, without redefining it, due to `opts_extend`
} sources = {
}) default = { 'lsp', 'path', 'snippets', 'buffer' },
end,
}, },
fuzzy = { implementation = "prefer_rust_with_warning" }
},
opts_extend = { "sources.default" }
},
-- {
-- "L3MON4D3/LuaSnip",
-- build = "make install_jsregexp",
-- dependencies = { "rafamadriz/friendly-snippets" },
-- },
--
-- -- │ Auto close │
-- {
-- "m4xshen/autoclose.nvim",
-- },
--
-- {
-- "windwp/nvim-ts-autotag",
-- config = function(_, opts)
-- require('nvim-ts-autotag').setup({
-- opts = {
-- enable_close = true, -- Auto close tags
-- enable_rename = true, -- Auto rename pairs of tags
-- enable_close_on_slash = false -- Auto close on trailing </
-- },
-- per_filetype = {
-- ["html"] = {
-- enable_close = true
-- }
-- }
-- })
-- end,
-- },
--
-- │ Diagnostics │ -- │ Diagnostics │
{ {
"folke/trouble.nvim", "folke/trouble.nvim",

74
lua/plugins/collections.lua
View File

@@ -1,39 +1,39 @@
return { return {
{ -- {
"folke/snacks.nvim", -- "folke/snacks.nvim",
priority = 1000, -- priority = 1000,
lazy = false, -- lazy = false,
---@type snacks.Config -- ---@type snacks.Config
opts = { -- opts = {
animate = { enabled = false }, -- animate = { enabled = false },
bigfile = { enabled = true }, -- bigfile = { enabled = true },
bufdelete = { enabled = true }, -- bufdelete = { enabled = true },
dashboard = { enabled = false }, -- dashboard = { enabled = false },
debug = { enabled = false }, -- debug = { enabled = false },
dim = { enabled = false }, -- dim = { enabled = false },
explorer = { enabled = false }, -- explorer = { enabled = false },
git = { enabled = false }, -- git = { enabled = false },
gitbrowse = { enabled = false }, -- gitbrowse = { enabled = false },
image = { enabled = false }, -- image = { enabled = false },
indent = { enabled = false }, -- indent = { enabled = false },
input = { enabled = false }, -- input = { enabled = false },
layout = { enabled = false }, -- layout = { enabled = false },
lazygit = { enabled = true }, -- lazygit = { enabled = true },
picker = { enabled = false }, -- picker = { enabled = false },
notifier = { enabled = false }, -- notifier = { enabled = false },
profiler = { enabled = false }, -- profiler = { enabled = false },
quickfile = { enabled = true }, -- quickfile = { enabled = true },
rename = { enabled = false }, -- rename = { enabled = false },
scope = { enabled = false }, -- scope = { enabled = false },
scroll = { enabled = true }, -- scroll = { enabled = true },
scratch = { enabled = false }, -- scratch = { enabled = false },
statuscolumn = { enabled = false }, -- statuscolumn = { enabled = false },
terminal = { enabled = false }, -- terminal = { enabled = false },
toggle = { enabled = false }, -- toggle = { enabled = false },
util = { enabled = false }, -- util = { enabled = false },
win = { enabled = false }, -- win = { enabled = false },
words = { enabled = true }, -- words = { enabled = true },
zen = { enabled = true }, -- zen = { enabled = true },
} -- }
}, -- },
} }

32
lua/plugins/help.lua
View File

@@ -2,20 +2,20 @@
-- │ Usage help │ -- │ Usage help │
-- ╰────────────╯ -- ╰────────────╯
return { return {
{ -- {
"folke/which-key.nvim", -- "folke/which-key.nvim",
event = "VeryLazy", -- event = "VeryLazy",
opts = function() -- opts = function()
return require("plugins.opts.which-key") -- return require("plugins.opts.whichKey")
end, -- end,
keys = { -- keys = {
{ -- {
"<leader>?", -- "<leader>?",
function() -- function()
require("which-key").show({ global = false }) -- require("which-key").show({ global = false })
end, -- end,
desc = "Buffer Local Keymaps (which-key)", -- desc = "Buffer Local Keymaps (which-key)",
}, -- },
}, -- },
} -- }
} }

2
lua/plugins/opts/lualine.lua
View File

@@ -2,8 +2,6 @@ local options = {
options = { options = {
icons_enabled = true, icons_enabled = true,
theme = "auto", theme = "auto",
-- component_separators = { left = "", right = "" },
-- section_separators = { left = "", right = "" },
component_separators = { left = "╎", right = "╎" }, component_separators = { left = "╎", right = "╎" },
section_separators = { left = "┃", right = "┃" }, section_separators = { left = "┃", right = "┃" },
disabled_filetypes = { disabled_filetypes = {

0
lua/plugins/opts/which-key.lua → lua/plugins/opts/whichKey.lua
View File

1
lua/plugins/style.lua
View File

@@ -11,6 +11,7 @@ return {
variant = "darker", -- dark, light, darker variant = "darker", -- dark, light, darker
}, },
}, },
{ "echasnovski/mini.icons" },
{ {
"folke/noice.nvim", "folke/noice.nvim",
event = "VeryLazy", event = "VeryLazy",