From 1f040c70abef1307c759ecca97c2f31b5ce50f47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Pankowski?= Date: Sat, 29 Jun 2024 13:41:33 +0200 Subject: [PATCH] nvim: use config second opts option when calling setup --- nvim/.config/nvim/lua/plugins/convenience.lua | 8 +++---- nvim/.config/nvim/lua/plugins/editing.lua | 4 ++-- nvim/.config/nvim/lua/plugins/git.lua | 12 +++++++---- nvim/.config/nvim/lua/plugins/go.lua | 4 ++-- nvim/.config/nvim/lua/plugins/init.lua | 20 ++++++++++-------- nvim/.config/nvim/lua/plugins/lsp.lua | 9 ++++---- nvim/.config/nvim/lua/plugins/persisted.lua | 21 ++++++++++--------- 7 files changed, 43 insertions(+), 35 deletions(-) diff --git a/nvim/.config/nvim/lua/plugins/convenience.lua b/nvim/.config/nvim/lua/plugins/convenience.lua index 8e64d60..76e6ef4 100644 --- a/nvim/.config/nvim/lua/plugins/convenience.lua +++ b/nvim/.config/nvim/lua/plugins/convenience.lua @@ -2,8 +2,8 @@ return { { 'folke/which-key.nvim', event = 'VimEnter', - config = function() - require('which-key').setup() + config = function(_, opts) + require('which-key').setup(opts) -- Document existing key chains require('which-key').register { @@ -18,8 +18,8 @@ return { }, { "max397574/better-escape.nvim", - config = function() - require("better_escape").setup() + config = function(_, opts) + require("better_escape").setup(opts) end, }, } diff --git a/nvim/.config/nvim/lua/plugins/editing.lua b/nvim/.config/nvim/lua/plugins/editing.lua index d905368..9a03b16 100644 --- a/nvim/.config/nvim/lua/plugins/editing.lua +++ b/nvim/.config/nvim/lua/plugins/editing.lua @@ -15,8 +15,8 @@ return { "kylechui/nvim-surround", version = "*", -- Use for stability; omit to use `main` branch for the latest features event = "VeryLazy", - config = function() - require("nvim-surround").setup({}) + config = function(_, opts) + require("nvim-surround").setup(opts) end }, } diff --git a/nvim/.config/nvim/lua/plugins/git.lua b/nvim/.config/nvim/lua/plugins/git.lua index df1cfef..e4c6e3f 100644 --- a/nvim/.config/nvim/lua/plugins/git.lua +++ b/nvim/.config/nvim/lua/plugins/git.lua @@ -7,9 +7,13 @@ return { 'sindrets/diffview.nvim', 'nvim-telescope/telescope.nvim', }, - config = function() + opts = { + graph_style = 'unicode', + use_per_project_settings = false, + }, + config = function(_, opts) local neogit = require('neogit') - neogit.setup() + neogit.setup(opts) vim.keymap.set('n', 'go', neogit.open, { desc = 'Neo[g]it [O]pen' }) vim.keymap.set('n', 'g.', function() neogit.open({ cwd = '%:p:h' }) end, { desc = 'Neo[g]it open in current file repository' }) @@ -22,8 +26,8 @@ return { { 'FabijanZulj/blame.nvim', - config = function() - require('blame').setup() + config = function(_, opts) + require('blame').setup(opts) end, cmd = 'BlameToggle', keys = { diff --git a/nvim/.config/nvim/lua/plugins/go.lua b/nvim/.config/nvim/lua/plugins/go.lua index ce10453..ad4831c 100644 --- a/nvim/.config/nvim/lua/plugins/go.lua +++ b/nvim/.config/nvim/lua/plugins/go.lua @@ -5,8 +5,8 @@ return { "neovim/nvim-lspconfig", "nvim-treesitter/nvim-treesitter", }, - config = function() - require("go").setup() + config = function(_, opts) + require("go").setup(opts) end, event = { "CmdlineEnter" }, ft = { "go", 'gomod' }, diff --git a/nvim/.config/nvim/lua/plugins/init.lua b/nvim/.config/nvim/lua/plugins/init.lua index 7a87884..a74a887 100644 --- a/nvim/.config/nvim/lua/plugins/init.lua +++ b/nvim/.config/nvim/lua/plugins/init.lua @@ -28,11 +28,12 @@ return { { 'stevearc/oil.nvim', dependencies = { "nvim-tree/nvim-web-devicons" }, - config = function(opts) - require("oil").setup({ - default_file_explorer = true, - delete_to_trash = true, - }) + opts = { + default_file_explorer = true, + delete_to_trash = true, + }, + config = function(_, opts) + require("oil").setup(opts) vim.keymap.set("n", "-", "Oil", { desc = "Open parent directory" }) end }, @@ -40,11 +41,12 @@ return { { 'Wansmer/treesj', dependencies = { 'nvim-treesitter/nvim-treesitter' }, - config = function() + opts = { + use_default_keymaps = false, + }, + config = function(_, opts) local tsj = require('treesj') - tsj.setup({ - use_default_keymaps = false, - }) + tsj.setup(opts) vim.keymap.set('n', 'tg', tsj.toggle, { desc = "[T]ree to[g]gle one-line" }) vim.keymap.set('n', 'tj', tsj.join, { desc = "[T]ree [J]oin one-line" }) vim.keymap.set('n', 'ts', tsj.split, { desc = "[T]ree [S]plit one-line" }) diff --git a/nvim/.config/nvim/lua/plugins/lsp.lua b/nvim/.config/nvim/lua/plugins/lsp.lua index 533f718..cb87193 100644 --- a/nvim/.config/nvim/lua/plugins/lsp.lua +++ b/nvim/.config/nvim/lua/plugins/lsp.lua @@ -126,10 +126,11 @@ return { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons', }, - config = function() - require('lspsaga').setup({ - lightbulb = { enable = false } - }) + opts = { + lightbulb = { enable = false } + }, + config = function(_, opts) + require('lspsaga').setup(opts) vim.keymap.set('n', 'la', 'Lspsaga code_action', { desc = "[L]spsaga code [A]ction" }) vim.keymap.set('n', 'lb', 'Lspsaga show_buf_diagnostics', { desc = "[L]spsaga [B]uffer diagnostics" }) diff --git a/nvim/.config/nvim/lua/plugins/persisted.lua b/nvim/.config/nvim/lua/plugins/persisted.lua index 07d4a60..de85334 100644 --- a/nvim/.config/nvim/lua/plugins/persisted.lua +++ b/nvim/.config/nvim/lua/plugins/persisted.lua @@ -1,16 +1,17 @@ return { "olimorris/persisted.nvim", lazy = false, -- make sure the plugin is always loaded at startup - config = function() - require("persisted").setup({ - autoload = true, - ignored_dirs = { - "~/.config", - "~/tmp", - "/tmp", - { "/", exact = true }, - }, - }) + opts = { + autoload = true, + ignored_dirs = { + "~/.config", + "~/tmp", + "/tmp", + { "/", exact = true }, + }, + }, + config = function(_, opts) + require("persisted").setup(opts) require("telescope").load_extension("persisted") end, keys = {