Make plugin specs more uniform

home/.config/nvim/lua/plugins/autopairs.lua

@@ -1,2 +1,5 @@
 -- Automatic brackets
-return { "windwp/nvim-autopairs" }
+return {
+  "windwp/nvim-autopairs",
+  config = true
+}

home/.config/nvim/lua/plugins/bufferline.lua

@@ -2,6 +2,4 @@ return {
   "akinsho/bufferline.nvim",
   version = "*",
   dependencies = { "kyazdani42/nvim-web-devicons" },
-  config = true,
-  --opts = { options = { themeable = true } },
 }

home/.config/nvim/lua/plugins/caddyfile.lua

@@ -1,2 +1,5 @@
 -- Caddyfile syntax support
-return { "isobit/vim-caddyfile", ft = "caddyfile" }
+return {
+  "isobit/vim-caddyfile",
+  ft = "caddyfile",
+}

home/.config/nvim/lua/plugins/cmp.lua

@@ -3,14 +3,23 @@ return {
   "hrsh7th/nvim-cmp",
   dependencies = {
     "hrsh7th/cmp-buffer", -- Buffer source
-    { "petertriho/cmp-git", dependencies = { "nvim-lua/plenary.nvim" } }, -- Git source
+    -- Git source
+    {
+      "petertriho/cmp-git",
+      dependencies = { "nvim-lua/plenary.nvim" },
+      config = true,
+    },
     "hrsh7th/cmp-nvim-lsp", -- LSP source
     "hrsh7th/cmp-nvim-lua", -- Neovim Lua API documentation source
     "hrsh7th/cmp-path", -- Path source
     "hrsh7th/cmp-cmdline", -- cmdline source
     "saadparwaiz1/cmp_luasnip", -- Snippets source
     "f3fora/cmp-spell", -- Spell check source
-    "zbirenbaum/copilot-cmp", -- Copilot source
+    -- Copilot source
+    {
+      "zbirenbaum/copilot-cmp",
+      opts = { fix_pairs = true },
+    },
   },
   config = function()
     local cmp = require("cmp")
@@ -20,12 +29,6 @@ return {
       return
     end
 
-    -- Setup git completion source
-    require("cmp_git").setup()
-    --
-    -- Setup copilot source
-    require("copilot_cmp").setup({ fix_pairs = true })
-
     -- Set completeopt to have a better completion experience
     vim.o.completeopt = "menuone,noselect"
 

home/.config/nvim/lua/plugins/copilot.lua

@@ -1,7 +1,6 @@
 -- GitHub Copilot
 return {
   "zbirenbaum/copilot.lua",
-  config = true,
   opts = {
     suggestion = { enabled = false },
     panel = { enabled = false },

home/.config/nvim/lua/plugins/emmylua.lua

@@ -1,2 +1,5 @@
 -- vim api documentation for lua lsp
-return { "ii14/emmylua-nvim", ft = { "lua" } }
+return {
+  "ii14/emmylua-nvim",
+  ft = { "lua" },
+}

home/.config/nvim/lua/plugins/gnupg.lua

@@ -1,2 +1,5 @@
 -- Edit GPG encrypted files transparently
-return { "jamessan/vim-gnupg", ft = { "gpg" } }
+return {
+  "jamessan/vim-gnupg",
+  ft = { "gpg" },
+}

home/.config/nvim/lua/plugins/indent-blankline.lua

@@ -1,23 +1,22 @@
 -- Indent characters
 return {
   "lukas-reineke/indent-blankline.nvim",
-  config = function()
-    require("ibl").setup({
-      exclude = {
-        filetypes = {
-          "",
-          "checkhealth",
-          "dashboard",
-          "git",
-          "gitcommit",
-          "TelescopePrompt",
-          "TelescopeResults",
-          "help",
-          "lazy",
-          "lspinfo",
-          "man",
-        },
+  opts = {
+    exclude = {
+      filetypes = {
+        "",
+        "checkhealth",
+        "dashboard",
+        "git",
+        "gitcommit",
+        "TelescopePrompt",
+        "TelescopeResults",
+        "help",
+        "lazy",
+        "lspinfo",
+        "man",
       },
-    })
-  end,
+    },
+  },
+  main = "ibl",
 }

home/.config/nvim/lua/plugins/kanagawa.lua

@@ -45,7 +45,8 @@ return {
       }
     end,
   },
-  config = function()
+  config = function(spec)
+    require("kanagawa").setup(spec.opts)
     vim.cmd("colorscheme kanagawa")
   end,
 }

home/.config/nvim/lua/plugins/nvim-colorizer.lua

@@ -1,4 +1,7 @@
 -- High performance color highlighter
 return {
   "norcalli/nvim-colorizer.lua",
+  config = function()
+    require("colorizer").setup()
+  end,
 }

home/.config/nvim/lua/plugins/nvim-tree.lua

@@ -11,8 +11,8 @@ return {
       highlight_git = true,
     },
   },
-  config = function(spec)
-    require("nvim-tree").setup(spec.opts)
+  config = function(_, opts)
+    require("nvim-tree").setup(opts)
 
     -- Open/close with alt-o
     vim.keymap.set("n", "<M-o>", vim.cmd.NvimTreeToggle)

home/.config/nvim/lua/plugins/telescope.lua

@@ -45,11 +45,11 @@ return {
       },
     },
   },
-  config = function(spec)
+  config = function(_, opts)
     local telescope = require("telescope")
     local builtin = require("telescope.builtin")
 
-    telescope.setup(spec.opts)
+    telescope.setup(opts)
 
     telescope.load_extension("fzf")
     telescope.load_extension("ui-select")

home/.config/nvim/lua/plugins/ufo.lua

@@ -9,9 +9,9 @@ return {
       "imports",
     },
   },
-  config = function(spec)
+  config = function(_, opts)
     local ufo = require("ufo")
-    ufo.setup(spec.opts)
+    ufo.setup(opts)
 
     -- Using ufo, need to remap `zR` and `zM`. If Neovim is 0.6.1, remap yourself
     local keymap = vim.keymap