From 83cd0a7540d1e2760980d2cd37a090bf188bf8bb Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Tue, 21 Nov 2023 22:28:54 +0200 Subject: [PATCH] Nvim: add type annotations to plugin opts --- home/.config/nvim/lua/plugins/bufferline.lua | 1 + home/.config/nvim/lua/plugins/cmp.lua | 4 - .../nvim/lua/plugins/indent-blankline.lua | 1 + home/.config/nvim/lua/plugins/kanagawa.lua | 1 + home/.config/nvim/lua/plugins/neoformat.lua | 3 +- home/.config/nvim/lua/plugins/noice.lua | 4 +- .../nvim/lua/plugins/nvim-colorizer.lua | 4 +- home/.config/nvim/lua/plugins/treesitter.lua | 88 +++++++++---------- home/.config/nvim/lua/plugins/which-key.lua | 2 +- 9 files changed, 50 insertions(+), 58 deletions(-) diff --git a/home/.config/nvim/lua/plugins/bufferline.lua b/home/.config/nvim/lua/plugins/bufferline.lua index bf800fd3..f6b42c4c 100644 --- a/home/.config/nvim/lua/plugins/bufferline.lua +++ b/home/.config/nvim/lua/plugins/bufferline.lua @@ -2,6 +2,7 @@ return { "akinsho/bufferline.nvim", version = "*", dependencies = { "kyazdani42/nvim-web-devicons" }, + ---@type BufferlineConfig opts = { options = { diagnostics = "nvim_lsp", diff --git a/home/.config/nvim/lua/plugins/cmp.lua b/home/.config/nvim/lua/plugins/cmp.lua index 5b177028..2eaf53b5 100644 --- a/home/.config/nvim/lua/plugins/cmp.lua +++ b/home/.config/nvim/lua/plugins/cmp.lua @@ -25,10 +25,6 @@ return { local cmp = require("cmp") local luasnip = require("luasnip") - if not cmp then - return - end - -- Set completeopt to have a better completion experience vim.o.completeopt = "menuone,noselect" diff --git a/home/.config/nvim/lua/plugins/indent-blankline.lua b/home/.config/nvim/lua/plugins/indent-blankline.lua index 75681f72..9aca163f 100644 --- a/home/.config/nvim/lua/plugins/indent-blankline.lua +++ b/home/.config/nvim/lua/plugins/indent-blankline.lua @@ -1,6 +1,7 @@ -- Indent characters return { "lukas-reineke/indent-blankline.nvim", + ---@type ibl.config opts = { exclude = { filetypes = { diff --git a/home/.config/nvim/lua/plugins/kanagawa.lua b/home/.config/nvim/lua/plugins/kanagawa.lua index d35ae0c4..cba20994 100644 --- a/home/.config/nvim/lua/plugins/kanagawa.lua +++ b/home/.config/nvim/lua/plugins/kanagawa.lua @@ -1,6 +1,7 @@ -- Colorscheme return { "rebelot/kanagawa.nvim", + ---@type KanagawaConfig opts = { compile = true, dimInactive = true, diff --git a/home/.config/nvim/lua/plugins/neoformat.lua b/home/.config/nvim/lua/plugins/neoformat.lua index 2abef6e4..988eef3d 100644 --- a/home/.config/nvim/lua/plugins/neoformat.lua +++ b/home/.config/nvim/lua/plugins/neoformat.lua @@ -2,8 +2,7 @@ return { "sbdchd/neoformat", config = function() - local wk = require("which-key") - wk.register({ + require("which-key").register({ f = { "Neoformat", "Format with Neoformat" }, }, { prefix = "" }) end, diff --git a/home/.config/nvim/lua/plugins/noice.lua b/home/.config/nvim/lua/plugins/noice.lua index 9ef7a91d..d4dbcaff 100644 --- a/home/.config/nvim/lua/plugins/noice.lua +++ b/home/.config/nvim/lua/plugins/noice.lua @@ -4,6 +4,7 @@ return { "folke/noice.nvim", event = "VeryLazy", dependencies = { "MunifTanjim/nui.nvim", "rcarriga/nvim-notify" }, + ---@type NoiceConfig opts = { lsp = { -- override markdown rendering so that **cmp** and other plugins use **Treesitter** @@ -19,8 +20,7 @@ return { }, }, config = function(_, opts) - local noice = require("noice") - noice.setup(opts) + require("noice").setup(opts) require("which-key").register({ d = { diff --git a/home/.config/nvim/lua/plugins/nvim-colorizer.lua b/home/.config/nvim/lua/plugins/nvim-colorizer.lua index c316742b..05ac1448 100644 --- a/home/.config/nvim/lua/plugins/nvim-colorizer.lua +++ b/home/.config/nvim/lua/plugins/nvim-colorizer.lua @@ -1,7 +1,5 @@ -- High performance color highlighter return { "norcalli/nvim-colorizer.lua", - config = function() - require("colorizer").setup() - end, + config = true, } diff --git a/home/.config/nvim/lua/plugins/treesitter.lua b/home/.config/nvim/lua/plugins/treesitter.lua index f181aea3..7a04584e 100644 --- a/home/.config/nvim/lua/plugins/treesitter.lua +++ b/home/.config/nvim/lua/plugins/treesitter.lua @@ -3,50 +3,46 @@ return { build = function() require("nvim-treesitter.install").update({ with_sync = true }) end, - config = function() - require("nvim-treesitter.configs").setup({ - ensure_installed = { - "bash", - "css", - "dockerfile", - "git_config", - "git_rebase", - "gitattributes", - "gitcommit", - "gitignore", - "html", - "http", - "java", - "javascript", - "json", - "json5", - "latex", - "lua", - "make", - "markdown", - "markdown_inline", - "php", - "python", - "rasi", - "regex", - "rst", - "scss", - "toml", - "tsx", - "typescript", - "vim", - "yaml", - }, - highlight = { enable = true }, - indent = { enable = true }, - incremental_selection = { enable = true }, - context_commentstring = { enable = true }, - sync_install = true, - ignore_install = {}, - auto_install = true, - }) - - -- vim.wo.foldmethod = 'expr' - -- im.wo.foldexpr = 'nvim_treesitter#foldexpr()' - end, + ---@type TSConfig + opts = { + ensure_installed = { + "bash", + "css", + "dockerfile", + "git_config", + "git_rebase", + "gitattributes", + "gitcommit", + "gitignore", + "html", + "http", + "java", + "javascript", + "json", + "json5", + "latex", + "lua", + "make", + "markdown", + "markdown_inline", + "php", + "python", + "rasi", + "regex", + "rst", + "scss", + "toml", + "tsx", + "typescript", + "vim", + "yaml", + }, + highlight = { enable = true }, + indent = { enable = true }, + incremental_selection = { enable = true }, + context_commentstring = { enable = true }, + sync_install = true, + ignore_install = {}, + auto_install = true, + }, } diff --git a/home/.config/nvim/lua/plugins/which-key.lua b/home/.config/nvim/lua/plugins/which-key.lua index cae24ffd..643b2c75 100644 --- a/home/.config/nvim/lua/plugins/which-key.lua +++ b/home/.config/nvim/lua/plugins/which-key.lua @@ -4,7 +4,7 @@ return { "folke/which-key.nvim", config = function() local wk = require("which-key") - wk.setup({}) + wk.setup() wk.register({ h = { "nohlsearch", "Turn off search highlight" },