dcarrillo/dotfiles
1
0
Fork 0
mirror of https://github.com/dcarrillo/dotfiles.git synced 2024-12-22 08:08:00 +00:00
Code Issues Releases Wiki Activity

[neovim] Simplify plugins including

Browse Source
This commit is contained in:
Daniel Carrillo 2023-04-12 20:09:30 +02:00
parent 3bc880fdac
commit 8af359f74f
Signed by: dcarrillo
GPG Key ID: E4CD5C09DAED6E16
28 changed files with 51 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
.config/nvim/lazy-lock.json
View File

@ -3,50 +3,50 @@
"DAPInstall.nvim": { "branch": "main", "commit": "8798b4c36d33723e7bba6ed6e2c202f84bb300de" },
"LuaSnip": { "branch": "master", "commit": "500981ff6cefc7343e3959ef0f939bd0bfd49ba9" },
"auto-save.nvim": { "branch": "main", "commit": "4b59610e1318f8a89501cee9d47a0e8650f0a4d5" },
"b64.nvim": { "branch": "main", "commit": "12dde6ebc3035f010833f513cfbd9abad92b28b3" },
"b64.nvim": { "branch": "main", "commit": "0efc9f2d5baf546298c3ef936434fe5783d7ecb3" },
"bufferline.nvim": { "branch": "main", "commit": "eb4e95be22c55890b90fc01a8223e0c0ea4a0862" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-nvim-lsp": { "branch": "main", "commit": "0e6b2ed705ddcff9738ec4ea838141654f12eeef" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
"diffview.nvim": { "branch": "main", "commit": "6bebefbc4c90e6d2b8c65e65b055d284475d89f8" },
"diffview.nvim": { "branch": "main", "commit": "63720aa5a70ce4aa386be407d0e612cd9e63861a" },
"friendly-snippets": { "branch": "main", "commit": "8d91ba2dc2421a54981115f61b914974f938fa77" },
"fzy-lua-native": { "branch": "master", "commit": "45148b3f70d244e8b8b5db60df447a2b7ac2de9d" },
"git-blame.nvim": { "branch": "master", "commit": "06c20ea71a4519fc60caba9ac688f2f6404f03d5" },
"github-nvim-theme": { "branch": "main", "commit": "24c8706c9ad26b944f5a76dea999dca8708f252e" },
"gitsigns.nvim": { "branch": "main", "commit": "bb808fc7376ed7bac0fbe8f47b83d4bf01738167" },
"go.nvim": { "branch": "master", "commit": "8398343f2e161aec2d1a9324cd1c739eb379dd24" },
"go.nvim": { "branch": "master", "commit": "d7530aea0f1086d10e9267287966702616c366af" },
"guihua.lua": { "branch": "master", "commit": "d331b1526a87edbe13679298c3547d49f8a14ffc" },
"indent-blankline.nvim": { "branch": "master", "commit": "018bd04d80c9a73d399c1061fa0c3b14a7614399" },
"karen-yank.nvim": { "branch": "main", "commit": "19173ebc9542f42ad419f1c96d74c4e4feb1c094" },
"lazy.nvim": { "branch": "main", "commit": "57cce98dfdb2f2dd05a0567d89811e6d0505e13b" },
"leap.nvim": { "branch": "main", "commit": "f74473d23ebf60957e0db3ff8172349a82e5a442" },
"lspsaga.nvim": { "branch": "main", "commit": "1fbb3e4721354d0d0a20a28bb77b3f83fe68538b" },
"leap.nvim": { "branch": "main", "commit": "98a72ad93c629c49bd7127d342960cc1b159b620" },
"lspsaga.nvim": { "branch": "main", "commit": "1ead4ce8a20a8ac7e96aca038d54ceaa185be4e0" },
"lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" },
"lualine.nvim": { "branch": "master", "commit": "84ffb80e452d95e2c46fa29a98ea11a240f7843e" },
"markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "a8d5db8f227b9b236d1c54a9c6234bc033825ce7" },
"mason.nvim": { "branch": "main", "commit": "2311d9d883eb709ad9979a726a38c5ce1343b63c" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "b81c50c4baae7d80b1723b3fa86e814d7754d15b" },
"mason.nvim": { "branch": "main", "commit": "df4bf38688c31056d222e68aa9f26e3c51090a97" },
"mini.align": { "branch": "main", "commit": "7c3775294c152253d11bfef5474c0f29e833316b" },
"mini.starter": { "branch": "main", "commit": "52f44482f68424056d4bd4fd1c679d742a0ed92b" },
"neo-tree.nvim": { "branch": "v2.x", "commit": "2b2f74828eeb02cf29d6b21aa32eedadadc94ca7" },
"nui.nvim": { "branch": "main", "commit": "1f43b13d133eb4b4f53a4485379d9afa58808389" },
"null-ls.nvim": { "branch": "main", "commit": "5855128178fa78293acdfb5b4e41ef046779240b" },
"nui.nvim": { "branch": "main", "commit": "ecd9def93891b9260b15b5fcef542eaabf4145c9" },
"null-ls.nvim": { "branch": "main", "commit": "f8ffcd7cb8fb3325c711d459152ef132b5b65aed" },
"nvim-autopairs": { "branch": "master", "commit": "7470af886ffb3df32800e5ef9c072a6cd825770d" },
"nvim-cmp": { "branch": "main", "commit": "777450fd0ae289463a14481673e26246b5e38bf2" },
"nvim-dap": { "branch": "master", "commit": "debd7c2f80eaf20c5f5df25db8d8c1b9b18f4421" },
"nvim-dap-ui": { "branch": "master", "commit": "1e21b3b50e67700e32285b5a74e645311fd8bbea" },
"nvim-dap-virtual-text": { "branch": "master", "commit": "9dc45a6eb33871f4c5cb2ba08fa307467657471e" },
"nvim-lspconfig": { "branch": "master", "commit": "27e9e1d2638ffd133b06f314a49ac55825cb1017" },
"nvim-treesitter": { "branch": "master", "commit": "fa9fe9a95ba481e26e11eede4657f8c5350a0eaa" },
"nvim-lspconfig": { "branch": "master", "commit": "6fe69025b8825029ea9bf291ab3b1750f9bcb39e" },
"nvim-treesitter": { "branch": "master", "commit": "0efa55ae2e6676b1a4cb66c5ee31ea295c6ebc2f" },
"nvim-ts-context-commentstring": { "branch": "main", "commit": "729d83ecb990dc2b30272833c213cc6d49ed5214" },
"nvim-web-devicons": { "branch": "master", "commit": "f16ec8f6e5d23e4349501dae46e0a661918e086e" },
"plenary.nvim": { "branch": "master", "commit": "253d34830709d690f013daf2853a9d21ad7accab" },
"nvim-web-devicons": { "branch": "master", "commit": "4ec26d67d419c12a4abaea02f1b6c57b40c08d7e" },
"plenary.nvim": { "branch": "master", "commit": "9ac3e9541bbabd9d73663d757e4fe48a675bb054" },
"projections.nvim": { "branch": "main", "commit": "008de87749e6baa402a2ce2f3ebc75e724b95da1" },
"sad.nvim": { "branch": "master", "commit": "869c7f3ca3dcd28fd78023db6a7e1bf8af0f4714" },
"telescope-fzf-native.nvim": { "branch": "main", "commit": "580b6c48651cabb63455e97d7e131ed557b8c7e2" },
"telescope-ui-select.nvim": { "branch": "master", "commit": "62ea5e58c7bbe191297b983a9e7e89420f581369" },
"telescope.nvim": { "branch": "master", "commit": "2ea61f1952f0ad10e4fcc282468a06d3e69674c2" },
"telescope.nvim": { "branch": "master", "commit": "6258d50b09f9ae087317e392efe7c05a7323492d" },
"tokyonight.nvim": { "branch": "main", "commit": "1b0c88094548a62641ece1e668fa9a234e1c539e" },
"trouble.nvim": { "branch": "main", "commit": "2ae7237c2917d661f458443c9a88680f8ca2d7b2" },
"vim-bbye": { "branch": "master", "commit": "25ef93ac5a87526111f43e5110675032dbcacf56" },

7
.config/nvim/lua/core/plugins.lua
View File

@ -13,18 +13,13 @@ vim.opt.rtp:prepend(lazypath)
vim.g.mapleader = " "
vim.g.maplocalleader = " "
local status_ok, lazy = pcall(require, "lazy")
if not status_ok then
return
end
local lazy_opts = {
ui = {
border = "rounded",
},
}
lazy.setup({
require("lazy").setup({
-- Colorschemes
{
"folke/tokyonight.nvim",

7
.config/nvim/lua/plugins/align.lua
View File

@ -1,6 +1 @@
local status_ok, align = pcall(require, "mini.align")
if not status_ok then
return
end
align.setup({})
require("mini.align").setup({})

13
.config/nvim/lua/plugins/autopairs.lua
View File

@ -1,10 +1,5 @@
-- Setup nvim-cmp.
local status_ok, npairs = pcall(require, "nvim-autopairs")
if not status_ok then
return
end
npairs.setup({
require("nvim-autopairs").setup({
check_ts = true,
disable_filetype = { "TelescopePrompt", "neo-tree" },
ts_config = {
@ -24,8 +19,4 @@ npairs.setup({
})
local cmp_autopairs = require("nvim-autopairs.completion.cmp")
local cmp_status_ok, cmp = pcall(require, "cmp")
if not cmp_status_ok then
return
end
cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done({}))
require("cmp").event:on("confirm_done", cmp_autopairs.on_confirm_done({}))

7
.config/nvim/lua/plugins/autosave.lua
View File

@ -1,9 +1,4 @@
local status_ok, autosave = pcall(require, "auto-save")
if not status_ok then
return
end
autosave.setup({
require("auto-save").setup({
execution_message = {
message = function()
return ""

13
.config/nvim/lua/plugins/bufferline.lua
View File

@ -1,9 +1,4 @@
local status_ok, bufferline = pcall(require, "bufferline")
if not status_ok then
return
end
bufferline.setup({
require("bufferline").setup({
options = {
close_command = "Bdelete! %d", -- can be a string | function, see "Mouse actions"
right_mouse_command = "Bdelete! %d", -- can be a string | function, see "Mouse actions"
@ -24,12 +19,10 @@ bufferline.setup({
fg = { attribute = "fg", highlight = "TabLine" },
bg = { attribute = "bg", highlight = "TabLine" },
},
buffer_visible = {
fg = { attribute = "fg", highlight = "TabLine" },
bg = { attribute = "bg", highlight = "TabLine" },
},
close_button = {
fg = { attribute = "fg", highlight = "TabLine" },
bg = { attribute = "bg", highlight = "TabLine" },
@ -38,7 +31,6 @@ bufferline.setup({
fg = { attribute = "fg", highlight = "TabLine" },
bg = { attribute = "bg", highlight = "TabLine" },
},
tab_selected = {
fg = { attribute = "fg", highlight = "Normal" },
bg = { attribute = "bg", highlight = "Normal" },
@ -51,7 +43,6 @@ bufferline.setup({
fg = { attribute = "fg", highlight = "TabLineSel" },
bg = { attribute = "bg", highlight = "Normal" },
},
duplicate_selected = {
fg = { attribute = "fg", highlight = "TabLineSel" },
bg = { attribute = "bg", highlight = "TabLineSel" },
@ -67,7 +58,6 @@ bufferline.setup({
bg = { attribute = "bg", highlight = "TabLine" },
italic = true,
},
modified = {
fg = { attribute = "fg", highlight = "TabLine" },
bg = { attribute = "bg", highlight = "TabLine" },
@ -80,7 +70,6 @@ bufferline.setup({
fg = { attribute = "fg", highlight = "TabLine" },
bg = { attribute = "bg", highlight = "TabLine" },
},
separator = {
fg = { attribute = "bg", highlight = "TabLine" },
bg = { attribute = "bg", highlight = "TabLine" },

12
.config/nvim/lua/plugins/cmp.lua
View File

@ -1,12 +1,5 @@
local cmp_status_ok, cmp = pcall(require, "cmp")
if not cmp_status_ok then
return
end
local snip_status_ok, luasnip = pcall(require, "luasnip")
if not snip_status_ok then
return
end
local cmp = require("cmp")
local luasnip = require("luasnip")
require("luasnip/loaders/from_vscode").lazy_load()
@ -49,7 +42,6 @@ cmp.setup({
luasnip.lsp_expand(args.body)
end,
},
mapping = cmp.mapping.preset.insert({
["<C-k>"] = cmp.mapping.select_prev_item(),
["<C-j>"] = cmp.mapping.select_next_item(),

7
.config/nvim/lua/plugins/comment.lua
View File

@ -1,6 +1 @@
local status_ok, comment = pcall(require, "Comment")
if not status_ok then
return
end
comment.setup({})
require("Comment").setup({})

18
.config/nvim/lua/plugins/dap.lua
View File

@ -1,19 +1,7 @@
local dap_status_ok, dap = pcall(require, "dap")
if not dap_status_ok then
return
end
local dap = require("dap")
local dapui = require("dapui")
local dap_ui_status_ok, dapui = pcall(require, "dapui")
if not dap_ui_status_ok then
return
end
local dap_install_status_ok, dap_install = pcall(require, "dap-install")
if not dap_install_status_ok then
return
end
dap_install.config("python", {})
require("dap-install").config("python", {})
dapui.setup({
layouts = {
{

7
.config/nvim/lua/plugins/diffview.lua
View File

@ -1,9 +1,4 @@
local status_ok, diffview = pcall(require, "diffview")
if not status_ok then
return
end
diffview.setup({
require("diffview").setup({
view = {
merge_tool = {
layout = "diff3_mixed",

8
.config/nvim/lua/plugins/gitsigns.lua
View File

@ -1,9 +1,4 @@
local status_ok, gitsigns = pcall(require, "gitsigns")
if not status_ok then
return
end
gitsigns.setup({
require("gitsigns").setup({
signs = {
add = { hl = "GitSignsAdd", text = "", numhl = "GitSignsAddNr", linehl = "GitSignsAddLn" },
change = { hl = "GitSignsChange", text = "", numhl = "GitSignsChangeNr", linehl = "GitSignsChangeLn" },
@ -14,7 +9,6 @@ gitsigns.setup({
preview_config = {
border = "rounded",
},
on_attach = function(bufnr)
local gs = package.loaded.gitsigns

7
.config/nvim/lua/plugins/go.lua
View File

@ -1,9 +1,4 @@
local status_ok, go = pcall(require, "go")
if not status_ok then
return
end
go.setup({
require("go").setup({
icons = { breakpoint = "", currentpos = "🏃" },
fillstruct = "fillstruct",
gofmt = "gofumpt",

7
.config/nvim/lua/plugins/illuminate.lua
View File

@ -1,9 +1,4 @@
local status_ok, illuminate = pcall(require, "illuminate")
if not status_ok then
return
end
illuminate.configure({
require("illuminate").configure({
delay = 200,
filetypes_denylist = {
"neo-tree",

7
.config/nvim/lua/plugins/indentline.lua
View File

@ -1,9 +1,4 @@
local status_ok, indent_blankline = pcall(require, "indent_blankline")
if not status_ok then
return
end
indent_blankline.setup({
require("indent_blankline").setup({
char = "▏",
show_trailing_blankline_indent = false,
show_first_indent_level = true,

11
.config/nvim/lua/plugins/lsp/handlers.lua
View File

@ -1,9 +1,6 @@
local M = {}
local status_cmp_ok, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp")
if not status_cmp_ok then
return
end
local cmp_nvim_lsp = require("cmp_nvim_lsp")
M.capabilities = cmp_nvim_lsp.default_capabilities()
M.capabilities.textDocument.completion.completionItem.snippetSupport = true
@ -58,11 +55,7 @@ M.on_attach = function(client)
client.server_capabilities.hover = false
end
local status_ok, illuminate = pcall(require, "illuminate")
if not status_ok then
return
end
illuminate.on_attach(client)
require("illuminate").on_attach(client)
end
return M

6
.config/nvim/lua/plugins/lsp/init.lua
View File

@ -1,12 +1,8 @@
local status_ok, win = pcall(require, "lspconfig.ui.windows")
if not status_ok then
return
end
require("plugins.lsp.mason")
require("plugins.lsp.handlers").setup()
require("plugins.lsp.null-ls")
require("plugins.lsp.lsp-saga")
require("plugins.lsp.yaml-companion")
local win = require("lspconfig.ui.windows")
win.default_options.border = "rounded"

7
.config/nvim/lua/plugins/lsp/lsp-saga.lua
View File

@ -1,9 +1,4 @@
local status_ok, lsp_saga = pcall(require, "lspsaga")
if not status_ok then
return
end
lsp_saga.setup({
require("lspsaga").setup({
ui = {
border = "rounded",
code_action_icon = "",

14
.config/nvim/lua/plugins/lsp/mason.lua
View File

@ -31,23 +31,17 @@ require("mason-lspconfig").setup({
automatic_installation = true,
})
local lspconfig_status_ok, lspconfig = pcall(require, "lspconfig")
if not lspconfig_status_ok then
return
end
local opts = {}
local lspconfig = require("lspconfig")
for _, server in pairs(servers) do
opts = {
local opts = {
on_attach = require("plugins.lsp.handlers").on_attach,
capabilities = require("plugins.lsp.handlers").capabilities,
}
server = vim.split(server, "@")[1]
local require_ok, conf_opts = pcall(require, "plugins.lsp.settings." .. server)
if require_ok then
local config_exists, conf_opts = pcall(require, "plugins.lsp.settings." .. server)
if config_exists then
opts = vim.tbl_deep_extend("force", conf_opts, opts)
end

6
.config/nvim/lua/plugins/lsp/null-ls.lua
View File

@ -1,8 +1,4 @@
local null_ls_status_ok, null_ls = pcall(require, "null-ls")
if not null_ls_status_ok then
return
end
local null_ls = require("null-ls")
-- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/formatting
local formatting = null_ls.builtins.formatting
-- https://github.com/jose-elias-alvarez/null-ls.nvim/tree/main/lua/null-ls/builtins/diagnostics

12
.config/nvim/lua/plugins/lualine.lua
View File

@ -1,8 +1,3 @@
local status_ok, lualine = pcall(require, "lualine")
if not status_ok then
return
end
local hide_in_width = function()
return vim.fn.winwidth(0) > 80
end
@ -70,16 +65,13 @@ local get_schema = function()
end
end
local gitblame_status_ok, gitblame = pcall(require, "gitblame")
if not gitblame_status_ok then
return
end
local gitblame = require("gitblame")
vim.g.gitblame_date_format = "%r"
vim.g.gitblame_display_virtual_text = 0
vim.g.gitblame_message_template = "<author>, <date>"
lualine.setup({
require("lualine").setup({
options = {
globalstatus = true,
},

7
.config/nvim/lua/plugins/neo-tree.lua
View File

@ -1,11 +1,6 @@
local status_ok, neotree = pcall(require, "neo-tree")
if not status_ok then
return
end
vim.g.neo_tree_remove_legacy_commands = true
neotree.setup({
require("neo-tree").setup({
close_if_last_window = true,
auto_clean_after_session_restore = true,
open_files_do_not_replace_filetypes = { "terminal", "trouble", "qf", "starter" },

11
.config/nvim/lua/plugins/projections.lua
View File

@ -1,15 +1,8 @@
local status_ok, projections = pcall(require, "projections")
if not status_ok then
return
end
projections.setup({
require("projections").setup({
store_hooks = {
pre = function()
-- Close neo-tree before storing sessions
if pcall(require, "neo-tree") then
vim.cmd([[Neotree action=close]])
end
vim.cmd([[Neotree action=close]])
end,
},
})

7
.config/nvim/lua/plugins/sad.lua
View File

@ -1,9 +1,4 @@
local status_ok, sad = pcall(require, "sad")
if not status_ok then
return
end
sad.setup({
require("sad").setup({
diff = "delta",
ls_file = "fd",
exact = false,

6
.config/nvim/lua/plugins/starter.lua
View File

@ -1,8 +1,4 @@
local status_ok, starter = pcall(require, "mini.starter")
if not status_ok then
return
end
local starter = require("mini.starter")
local pad = string.rep(" ", 4)
local new_section = function(name, action, section)
return { name = name, action = action, section = pad .. section }

6
.config/nvim/lua/plugins/telescope.lua
View File

@ -1,8 +1,4 @@
local status_ok, telescope = pcall(require, "telescope")
if not status_ok then
return
end
local telescope = require("telescope")
local actions = require("telescope.actions")
telescope.setup({

7
.config/nvim/lua/plugins/treesitter.lua
View File

@ -1,9 +1,4 @@
local status_ok, configs = pcall(require, "nvim-treesitter.configs")
if not status_ok then
return
end
configs.setup({
require("nvim-treesitter.configs").setup({
ensure_installed = {
"lua",
"markdown",

7
.config/nvim/lua/plugins/trouble.lua
View File

@ -1,6 +1 @@
local status_ok, trouble = pcall(require, "trouble")
if not status_ok then
return
end
trouble.setup({})
require("trouble").setup({})

6
.config/nvim/lua/plugins/wilder.lua
View File

@ -1,7 +1,4 @@
local status_ok, wilder = pcall(require, "wilder")
if not status_ok then
return
end
local wilder = require("wilder")
wilder.setup({
modes = { ":" },
@ -58,7 +55,6 @@ wilder.set_option(
border = "Normal",
gradient = gradient,
},
border = "rounded",
highlighter = wilder.highlighter_with_gradient({
wilder.lua_fzy_highlighter(),