nvim: use config second opts option when calling setup

nvim/.config/nvim/lua/plugins/convenience.lua

@@ -2,8 +2,8 @@ return {
   {
     'folke/which-key.nvim',
     event = 'VimEnter',
-    config = function()
+    config = function(_, opts)
-      require('which-key').setup()
+      require('which-key').setup(opts)
 
       -- Document existing key chains
       require('which-key').register {
@@ -18,8 +18,8 @@ return {
   },
   {
     "max397574/better-escape.nvim",
-    config = function()
+    config = function(_, opts)
-      require("better_escape").setup()
+      require("better_escape").setup(opts)
     end,
   },
 }

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()
+    config = function(_, opts)
-      require("nvim-surround").setup({})
+      require("nvim-surround").setup(opts)
     end
   },
 }

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', '<leader>go', neogit.open, { desc = 'Neo[g]it [O]pen' })
       vim.keymap.set('n', '<leader>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()
+    config = function(_, opts)
-      require('blame').setup()
+      require('blame').setup(opts)
     end,
     cmd = 'BlameToggle',
     keys = {

nvim/.config/nvim/lua/plugins/go.lua

@@ -5,8 +5,8 @@ return {
     "neovim/nvim-lspconfig",
     "nvim-treesitter/nvim-treesitter",
   },
-  config = function()
+  config = function(_, opts)
-    require("go").setup()
+    require("go").setup(opts)
   end,
   event = { "CmdlineEnter" },
   ft = { "go", 'gomod' },

nvim/.config/nvim/lua/plugins/init.lua

@@ -28,11 +28,12 @@ return {
   {
     'stevearc/oil.nvim',
     dependencies = { "nvim-tree/nvim-web-devicons" },
-    config = function(opts)
+    opts = {
-      require("oil").setup({
       default_file_explorer = true,
       delete_to_trash = true,
-      })
+    },
+    config = function(_, opts)
+      require("oil").setup(opts)
       vim.keymap.set("n", "-", "<cmd>Oil<CR>", { desc = "Open parent directory" })
     end
   },
@@ -40,11 +41,12 @@ return {
   {
     'Wansmer/treesj',
     dependencies = { 'nvim-treesitter/nvim-treesitter' },
-    config = function()
+    opts = {
-      local tsj = require('treesj')
-      tsj.setup({
       use_default_keymaps = false,
-      })
+    },
+    config = function(_, opts)
+      local tsj = require('treesj')
+      tsj.setup(opts)
       vim.keymap.set('n', '<leader>tg', tsj.toggle, { desc = "[T]ree to[g]gle one-line" })
       vim.keymap.set('n', '<leader>tj', tsj.join, { desc = "[T]ree [J]oin one-line" })
       vim.keymap.set('n', '<leader>ts', tsj.split, { desc = "[T]ree [S]plit one-line" })

nvim/.config/nvim/lua/plugins/lsp.lua

@@ -126,10 +126,11 @@ return {
       'nvim-treesitter/nvim-treesitter',
       'nvim-tree/nvim-web-devicons',
     },
-    config = function()
+    opts = {
-      require('lspsaga').setup({
       lightbulb = { enable = false }
-      })
+    },
+    config = function(_, opts)
+      require('lspsaga').setup(opts)
       vim.keymap.set('n', '<leader>la', '<cmd>Lspsaga code_action<CR>', { desc = "[L]spsaga code [A]ction" })
       vim.keymap.set('n', '<leader>lb', '<cmd>Lspsaga show_buf_diagnostics<CR>',
         { desc = "[L]spsaga [B]uffer diagnostics" })

nvim/.config/nvim/lua/plugins/persisted.lua

@@ -1,8 +1,7 @@
 return {
   "olimorris/persisted.nvim",
   lazy = false, -- make sure the plugin is always loaded at startup
-  config = function()
+  opts = {
-    require("persisted").setup({
     autoload = true,
     ignored_dirs = {
       "~/.config",
@@ -10,7 +9,9 @@ return {
       "/tmp",
       { "/", exact = true },
     },
-    })
+  },
+  config = function(_, opts)
+    require("persisted").setup(opts)
     require("telescope").load_extension("persisted")
   end,
   keys = {