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

possible.

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

@@ -1,19 +1,17 @@
 return {
     "rmagatti/auto-session",
-    config = function()
+    opts = {
-        require("auto-session").setup {
+        log_level = "error",
-            log_level = "error",
+        auto_session_suppress_dirs = {
-            auto_session_suppress_dirs = {
+            "/",
-                "/",
+            "~/",
-                "~/",
+            "~/Projects",
-                "~/Projects",
+            "~/Downloads",
-                "~/Downloads",
+            "~/Development",
-                "~/Development",
+            "~/Dev",
-                "~/Dev",
+            "~/Dev/Git",
-                "~/Dev/Git",
+            "~/.config",
-                "~/.config",
+            "~/dev/git/.dotfiles",
-                "~/dev/git/.dotfiles",
+        },
-            },
+    }
-        }
-    end
 }

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

@@ -1,17 +1,15 @@
 return {
     "norcalli/nvim-colorizer.lua",
-    config = function()
+    opts = {
-        require("colorizer").setup({
+        DEFAULT_OPTIONS = {
-            DEFAULT_OPTIONS = {
+            RGB = true,
-                RGB = true,
+            RRGGBB = true,
-                RRGGBB = true,
+            names = false,
-                names = false,
+            RRGGBBAA = true,
-                RRGGBBAA = true,
+            css = true,
-                css = true,
+            css_fn = true,
-                css_fn = true,
+            mode = "background",
-                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" },
-            keys = { f = "f", F = "F", t = "t", T = "T" },
+        labeled_modes = "v",
-            labeled_modes = "v",
+        multiline = true,
-            multiline = true,
+        opts = {}
-            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,
-            debounce = 100,
+        scope = {
-            scope = {
+            enabled = false
-                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,15 +2,13 @@ return {
     "kylechui/nvim-surround",
     version = "*",
     event = "VeryLazy",
-    config = function()
+    opts = {
-        require("nvim-surround").setup({
+        -- Make sure that we never get whitespaces when adding surroundings
-            -- Make sure that we never get whitespaces when adding surroundings
+        surrounds = {
-            surrounds = {
+            ["("] = { add = { "(", ")" }, },
-                ["("] = { add = { "(", ")" }, },
+            ["{"] = { add = { "{", "}" }, },
-                ["{"] = { add = { "{", "}" }, },
+            ["<"] = { add = { "<", ">" }, },
-                ["<"] = { add = { "<", ">" }, },
+            ["["] = { add = { "[", "]" }, },
-                ["["] = { add = { "[", "]" }, },
+        }
-            }
+    }
-        })
-    end,
 }

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

@@ -3,77 +3,76 @@ return {
     event = { "BufReadPre", "BufNewFile" },
     build = ":TSUpdate",
     dependencies = {
-        "nvim-treesitter/nvim-treesitter-context",
+        {
+            "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 = {
-            ensure_installed = {
+            "vim",
-                "vim",
+            "vimdoc",
-                "vimdoc",
+            "bash",
-                "bash",
+            "lua",
-                "lua",
+            "c",
-                "c",
+            "cpp",
-                "cpp",
+            "c_sharp",
-                "c_sharp",
+            "rust",
-                "rust",
+            "cmake",
-                "cmake",
+            "make",
-                "make",
+            "yaml",
-                "yaml",
+            "ninja",
-                "ninja",
+            "gitignore",
-                "gitignore",
+            "markdown",
-                "markdown",
+            "markdown_inline",
-                "markdown_inline",
+            "hyprlang",
-                "hyprlang",
+            "json",
-                "json",
+            "html",
-                "html",
+            "hlsl",
-                "hlsl",
+            "glsl",
-                "glsl",
+            "gdshader",
-                "gdshader",
+            "gdscript",
-                "gdscript",
+            "dockerfile",
-                "dockerfile",
+            "dart",
-                "dart",
+            "css",
-                "css",
+            "regex"
-                "regex"
+        },
+        sync_install = false,
+        -- This can be updated to a list of languages instead of defaulting to true
+        highlight = {
+            enable = true,
+            additional_vim_regex_highlighting = false,
+        },
+        indent = { enable = true },
+        incremental_selection = {
+            enable = true,
+            keymaps = {
+                init_selection = "<C-cr>",
+                node_incremental = "<C-cr>",
+                scope_incremental = false,
+                node_decremental = "<C-bs>",
             },
-            sync_install = false,
+        },
-            -- This can be updated to a list of languages instead of defaulting to true
+        textobjects = {
-            highlight = {
+            select = {
-                enable = true,
-                additional_vim_regex_highlighting = false,
-            },
-            indent = { enable = true },
-            incremental_selection = {
                 enable = true,
+                lookahead = true,
                 keymaps = {
-                    init_selection = "<C-cr>",
+                    ["ic"] = { query = "@class.inner" },
-                    node_incremental = "<C-cr>",
+                    ["ac"] = { query = "@class.outer" },
-                    scope_incremental = false,
+                    ["ii"] = { query = "@conditional.inner" },
-                    node_decremental = "<C-bs>",
+                    ["ai"] = { query = "@conditional.outer" },
+                    ["if"] = { query = "@function.inner" },
+                    ["af"] = { query = "@function.outer" },
+                    ["il"] = { query = "@loop.inner" },
+                    ["al"] = { query = "@loop.outer" },
                 },
             },
-            textobjects = {
+        },
-                select = {
+    }
-                    enable = true,
-                    lookahead = true,
-                    keymaps = {
-                        ["ic"] = { query = "@class.inner" },
-                        ["ac"] = { query = "@class.outer" },
-                        ["ii"] = { query = "@conditional.inner" },
-                        ["ai"] = { query = "@conditional.outer" },
-                        ["if"] = { query = "@function.inner" },
-                        ["af"] = { query = "@function.outer" },
-                        ["il"] = { query = "@loop.inner" },
-                        ["al"] = { query = "@loop.outer" },
-                    },
-                },
-            },
-        })
-
-        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,
 }