diff options
Diffstat (limited to '.config/nvim/lua/plugins')
| -rw-r--r-- | .config/nvim/lua/plugins/colorizer.lua | 14 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins/gentoo.lua | 25 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins/git.lua | 1 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins/lsp.lua | 25 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins/mini.lua | 2 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins/treesitter.lua | 65 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins/whichkey.lua | 3 |
7 files changed, 66 insertions, 69 deletions
diff --git a/.config/nvim/lua/plugins/colorizer.lua b/.config/nvim/lua/plugins/colorizer.lua index 2608ae6..c949058 100644 --- a/.config/nvim/lua/plugins/colorizer.lua +++ b/.config/nvim/lua/plugins/colorizer.lua @@ -4,12 +4,14 @@ return { -- 'norcalli/nvim-colorizer.lua', lazy = false, opts = { - name = true, - RRGGBB = true, - RRGGBBAA = true, - rgb_fn = true, - hsl_fn = true, - mode = 'background', + options = { + display = { + mode = 'background', + }, + parsers = { + css = true, + }, + }, }, }, } diff --git a/.config/nvim/lua/plugins/gentoo.lua b/.config/nvim/lua/plugins/gentoo.lua index 470e6de..15ef3aa 100644 --- a/.config/nvim/lua/plugins/gentoo.lua +++ b/.config/nvim/lua/plugins/gentoo.lua @@ -1,15 +1,18 @@ return { { - 'gentoo/gentoo-syntax', - -- ft = { 'ebuild' }, - -- init = function() - -- vim.api.nvim_create_autocmd('LspAttach', { - -- callback = function(args) - -- if vim.opt.filetype == 'ebuild' then - -- vim.lsp.stop_client(vim.lsp.get_clients({ bufnr = args.bufnr })) - -- end - -- end, - -- }) - -- end, + 'https://github.com/gentoo/gentoo-syntax', + lazy = false, + init = function() + vim.api.nvim_create_autocmd({ 'BufEnter' }, { + pattern = { '*/portage/package.*/' }, + group = vim.api.nvim_create_augroup('gentoo-syntax-oil', {}), + callback = function(args) + -- HACK: this should not be necessary + vim.defer_fn(function() + vim.opt_local.filetype = 'oil' + end, 50) + end, + }) + end, }, } diff --git a/.config/nvim/lua/plugins/git.lua b/.config/nvim/lua/plugins/git.lua index 04f0c9f..d1e3f7b 100644 --- a/.config/nvim/lua/plugins/git.lua +++ b/.config/nvim/lua/plugins/git.lua @@ -1,6 +1,7 @@ return { { 'lewis6991/gitsigns.nvim', + lazy = false, opts = { debug_mode = false, }, diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua index aebf3c4..311f1bc 100644 --- a/.config/nvim/lua/plugins/lsp.lua +++ b/.config/nvim/lua/plugins/lsp.lua @@ -2,5 +2,28 @@ return { { 'neovim/nvim-lspconfig', version = '^2.0', - } + }, + { + 'nvimtools/none-ls.nvim', + dependencies = { + 'nvim-lua/plenary.nvim', + 'gbprod/none-ls-shellcheck.nvim', + }, + config = function() + local nls = require('null-ls') + nls.setup({ + sources = { + -- nls.builtins.code_actions.impl, + -- nls.builtins.completions.spell, + + nls.builtins.formatting.stylua, + nls.builtins.formatting.shfmt, + nls.builtins.formatting.buf, + + require("none-ls-shellcheck.diagnostics"), + require("none-ls-shellcheck.code_actions"), + }, + }) + end, + }, } diff --git a/.config/nvim/lua/plugins/mini.lua b/.config/nvim/lua/plugins/mini.lua index 74cd962..fb4c9a6 100644 --- a/.config/nvim/lua/plugins/mini.lua +++ b/.config/nvim/lua/plugins/mini.lua @@ -2,7 +2,7 @@ return { { 'echasnovski/mini.align', version = false, - lazy = true, + lazy = false, opts = {}, }, { diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua index e064a8b..0978eb7 100644 --- a/.config/nvim/lua/plugins/treesitter.lua +++ b/.config/nvim/lua/plugins/treesitter.lua @@ -1,19 +1,26 @@ return { { 'nvim-treesitter/nvim-treesitter', - branch = 'master', + branch = 'main', lazy = false, - dependencies = { - { 'nvim-treesitter/nvim-treesitter-refactor', lazy = false }, - { 'nvim-treesitter/nvim-treesitter-textobjects', lazy = false }, - -- { 'nvim-treesitter/playground', cmd = { 'TSPlayground' } }, - }, build = ':TSUpdate', config = function(_, opts) - require('nvim-treesitter.configs').setup(opts) - - -- use bash parser for gentoo ebuilds - vim.treesitter.language.register('bash', 'ebuild') + -- enable indent + vim.api.nvim_create_autocmd('FileType', { + callback = function() + pcall(vim.treesitter.start) + vim.bo.indentexpr = [[v:lua.require'nvim-treesitter'.indentexpr()]] + end, + }) + -- auto-install + local already_installed = require('nvim-treesitter').get_installed() + local parsers_installable = vim + .iter(opts.ensure_installed) + :filter(function(parser) + return not vim.tbl_contains(already_installed, parser) + end) + :totable() + require('nvim-treesitter').install(parsers_installable) end, opts = { ensure_installed = { @@ -31,7 +38,6 @@ return { 'html', 'javascript', 'json', - 'jsonc', 'lua', 'make', 'markdown', @@ -51,43 +57,6 @@ return { 'yaml', 'zig', }, - highlight = { - enable = true, - additional_vim_regex_highlighting = { 'markdown' }, - }, - indent = { - enable = true, - }, - refactor = { - navigation = { - enable = true, - }, - smart_rename = { - enable = true, - }, - }, - textobjects = { - select = { - enable = true, - keymaps = { - ['ib'] = '@block.inner', - ['ab'] = '@block.outer', - -- ['ic'] = '@conditional.inner', - -- ['ac'] = '@conditional.outer', - ['if'] = '@function.inner', - ['af'] = '@function.outer', - ['il'] = '@loop.inner', - ['al'] = '@loop.outer', - ['is'] = '@scopename.inner', - ['as'] = '@scopename.outer', - ['ic'] = '@comment.inner', - ['ac'] = '@comment.outer', - }, - selection_mode = { - ['@comment.outer'] = 'V', - }, - }, - }, }, }, } diff --git a/.config/nvim/lua/plugins/whichkey.lua b/.config/nvim/lua/plugins/whichkey.lua index dc21eda..cb89df4 100644 --- a/.config/nvim/lua/plugins/whichkey.lua +++ b/.config/nvim/lua/plugins/whichkey.lua @@ -3,8 +3,7 @@ return { 'folke/which-key.nvim', event = 'VeryLazy', opts = { - sort = { 'alphanum' }, - icons = { separator = '→ ', group = '🞱 ' }, + icons = { separator = '→ ', group = ' +' }, }, }, } |