Light refactoring, move as many config = func uses into opts as

possible.

home/.config/nvim/lua/plugs/auto_session.lua

@@ -1,7 +1,6 @@
 return {
     "rmagatti/auto-session",
-    config = function()
+    opts = {
-        require("auto-session").setup {
         log_level = "error",
         auto_session_suppress_dirs = {
             "/",
@@ -15,5 +14,4 @@ return {
             "~/dev/git/.dotfiles",
         },
     }
-    end
 }

home/.config/nvim/lua/plugs/colorizer.lua

@@ -1,7 +1,6 @@
 return {
     "norcalli/nvim-colorizer.lua",
-    config = function()
+    opts = {
-        require("colorizer").setup({
         DEFAULT_OPTIONS = {
             RGB = true,
             RRGGBB = true,
@@ -12,6 +11,5 @@ return {
             mode = "background",
         },
         "*",
-        })
+    }
-    end,
 }

home/.config/nvim/lua/plugs/flit.lua

@@ -1,11 +1,9 @@
 return {
     "ggandor/flit.nvim",
-    config = function()
+    opts = {
-        require("flit").setup {
         keys = { f = "f", F = "F", t = "t", T = "T" },
         labeled_modes = "v",
         multiline = true,
         opts = {}
     }
-    end,
 }

home/.config/nvim/lua/plugs/indent_blankline.lua

@@ -1,12 +1,10 @@
 return {
     "lukas-reineke/indent-blankline.nvim",
     main = "ibl",
-    config = function()
+    opts = {
-        require("ibl").setup({
         debounce = 100,
         scope = {
             enabled = false
         },
-        })
+    }
-    end
 }

home/.config/nvim/lua/plugs/lspsaga.lua

@@ -8,15 +8,6 @@ return {
         require("lspsaga").setup({
             symbol_in_winbar = {
                 enable = false,
-                -- separator = " › ",
-                -- hide_keyword = true,
-                -- ignore_patterns = nil,
-                -- show_file = true,
-                -- folder_level = 2,
-                -- color_mode = true,
-                -- dely = 300,
-                -- show_nodes = true,
-                -- max_nodes = 2,
             },
             implement = {
                 enable = false,

home/.config/nvim/lua/plugs/plenary.lua

@@ -1,3 +0,0 @@
-return {
-    "nvim-lua/plenary.nvim",
-}

home/.config/nvim/lua/plugs/project.lua

@@ -1,6 +1,7 @@
 return {
     "LennyPhoenix/project.nvim",
     branch = "fix-get_clients",
+    -- This plugin does not have a lua module and we have to use config
     config = function()
         require("project_nvim").setup({
             patterns = {

home/.config/nvim/lua/plugs/reactive.lua

@@ -1,8 +1,9 @@
 return {
     "rasulomaroff/reactive.nvim",
-    config = function()
+    opts = {
-        require("reactive").setup({
+        load = {
-            load = { "catppuccin-macchiato-cursor", "catppuccin-macchiato-cursorline" }
+            "catppuccin-macchiato-cursor",
-        })
+            "catppuccin-macchiato-cursorline",
-    end,
+        }
+    }
 }

home/.config/nvim/lua/plugs/surround.lua

@@ -2,8 +2,7 @@ return {
     "kylechui/nvim-surround",
     version = "*",
     event = "VeryLazy",
-    config = function()
+    opts = {
-        require("nvim-surround").setup({
         -- Make sure that we never get whitespaces when adding surroundings
         surrounds = {
             ["("] = { add = { "(", ")" }, },
@@ -11,6 +10,5 @@ return {
             ["<"] = { add = { "<", ">" }, },
             ["["] = { add = { "[", "]" }, },
         }
-        })
+    }
-    end,
 }

home/.config/nvim/lua/plugs/treesitter.lua

@@ -3,11 +3,17 @@ return {
     event = { "BufReadPre", "BufNewFile" },
     build = ":TSUpdate",
     dependencies = {
+        {
             "nvim-treesitter/nvim-treesitter-context",
+            opts = {
+                max_lines = 2,           -- How many lines the window should span. Values <= 0 mean no limit.
+                multiline_threshold = 3, -- Maximum number of lines to show for a single context
+                trim_scope = "inner",    -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer'
+            }
+        },
         "nvim-treesitter/nvim-treesitter-textobjects",
     },
-    config = function()
+    opts = {
-        require("nvim-treesitter.configs").setup({
         ensure_installed = {
             "vim",
             "vimdoc",
@@ -68,12 +74,5 @@ return {
                 },
             },
         },
-        })
+    }
-
-        require("treesitter-context").setup({
-            max_lines = 2,           -- How many lines the window should span. Values <= 0 mean no limit.
-            multiline_threshold = 3, -- Maximum number of lines to show for a single context
-            trim_scope = "inner",    -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer'
-        })
-    end,
 }