From 4004dc5df67a3f0ef169b55d7416db15d2758692 Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 18 Nov 2023 02:54:35 +0200 Subject: [PATCH] Make plugin specs more uniform --- home/.config/nvim/lua/plugins/autopairs.lua | 5 ++- home/.config/nvim/lua/plugins/bufferline.lua | 2 -- home/.config/nvim/lua/plugins/caddyfile.lua | 5 ++- home/.config/nvim/lua/plugins/cmp.lua | 19 +++++----- home/.config/nvim/lua/plugins/copilot.lua | 1 - home/.config/nvim/lua/plugins/emmylua.lua | 5 ++- home/.config/nvim/lua/plugins/gnupg.lua | 5 ++- .../nvim/lua/plugins/indent-blankline.lua | 35 +++++++++---------- home/.config/nvim/lua/plugins/kanagawa.lua | 3 +- .../nvim/lua/plugins/nvim-colorizer.lua | 3 ++ home/.config/nvim/lua/plugins/nvim-tree.lua | 4 +-- home/.config/nvim/lua/plugins/telescope.lua | 4 +-- home/.config/nvim/lua/plugins/ufo.lua | 4 +-- 13 files changed, 55 insertions(+), 40 deletions(-) diff --git a/home/.config/nvim/lua/plugins/autopairs.lua b/home/.config/nvim/lua/plugins/autopairs.lua index 79e2f49..f9886b5 100644 --- a/home/.config/nvim/lua/plugins/autopairs.lua +++ b/home/.config/nvim/lua/plugins/autopairs.lua @@ -1,2 +1,5 @@ -- Automatic brackets -return { "windwp/nvim-autopairs" } +return { + "windwp/nvim-autopairs", + config = true +} diff --git a/home/.config/nvim/lua/plugins/bufferline.lua b/home/.config/nvim/lua/plugins/bufferline.lua index 027fcb0..c1359e4 100644 --- a/home/.config/nvim/lua/plugins/bufferline.lua +++ b/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 } }, } diff --git a/home/.config/nvim/lua/plugins/caddyfile.lua b/home/.config/nvim/lua/plugins/caddyfile.lua index b419a59..89db6b5 100644 --- a/home/.config/nvim/lua/plugins/caddyfile.lua +++ b/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", +} diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 129c4c6..5b17702 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/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" diff --git a/home/.config/nvim/lua/plugins/copilot.lua b/home/.config/nvim/lua/plugins/copilot.lua index 16b97d1..e933120 100644 --- a/home/.config/nvim/lua/plugins/copilot.lua +++ b/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 }, diff --git a/home/.config/nvim/lua/plugins/emmylua.lua b/home/.config/nvim/lua/plugins/emmylua.lua index 11105cf..8e4dc1c 100644 --- a/home/.config/nvim/lua/plugins/emmylua.lua +++ b/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" }, +} diff --git a/home/.config/nvim/lua/plugins/gnupg.lua b/home/.config/nvim/lua/plugins/gnupg.lua index 22c3b58..ec6d634 100644 --- a/home/.config/nvim/lua/plugins/gnupg.lua +++ b/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" }, +} diff --git a/home/.config/nvim/lua/plugins/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua index f5743fe..75681f7 100644 --- a/home/.config/nvim/lua/plugins/indent-blankline.lua +++ b/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", } diff --git a/home/.config/nvim/lua/plugins/kanagawa.lua b/home/.config/nvim/lua/plugins/kanagawa.lua index bd7a0ab..b0c47d0 100644 --- a/home/.config/nvim/lua/plugins/kanagawa.lua +++ b/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, } diff --git a/home/.config/nvim/lua/plugins/nvim-colorizer.lua b/home/.config/nvim/lua/plugins/nvim-colorizer.lua index 089885d..c316742 100644 --- a/home/.config/nvim/lua/plugins/nvim-colorizer.lua +++ b/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, } diff --git a/home/.config/nvim/lua/plugins/nvim-tree.lua b/home/.config/nvim/lua/plugins/nvim-tree.lua index b15b0f0..ec9f895 100644 --- a/home/.config/nvim/lua/plugins/nvim-tree.lua +++ b/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", "", vim.cmd.NvimTreeToggle) diff --git a/home/.config/nvim/lua/plugins/telescope.lua b/home/.config/nvim/lua/plugins/telescope.lua index c2414c6..32a69dd 100644 --- a/home/.config/nvim/lua/plugins/telescope.lua +++ b/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") diff --git a/home/.config/nvim/lua/plugins/ufo.lua b/home/.config/nvim/lua/plugins/ufo.lua index 13c8253..acd7c47 100644 --- a/home/.config/nvim/lua/plugins/ufo.lua +++ b/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