From 1f0ef83535db8b2e36b1f86cc7d6244f092d11f2 Mon Sep 17 00:00:00 2001 From: Shubham Pawar Date: Tue, 14 Jan 2025 14:09:45 +0530 Subject: [PATCH] chore: renamed `plugins.config` to `my_config` and updated imports --- .../config => my_config}/catppuccin.lua | 7 ++ .../config => my_config}/gruber-darker.lua | 0 .../{plugins/config => my_config}/kangawa.lua | 0 .../{plugins/config => my_config}/nordic.lua | 0 .../{plugins/config => my_config}/onenord.lua | 0 .../config => my_config}/tokyonight.lua | 0 .../{plugins/config => my_config}/util.lua | 0 .config/nvim/lua/plugins/avante.lua | 4 +- .config/nvim/lua/plugins/blink-cmp.lua | 117 ++++++++++-------- .config/nvim/lua/plugins/dial.lua | 2 +- .config/nvim/lua/plugins/fzf-lua.lua | 30 ++--- .config/nvim/lua/plugins/lsp/astrolsp.lua | 2 +- .config/nvim/lua/plugins/lsp/cpp.lua | 4 +- .config/nvim/lua/plugins/lsp/elixir.lua | 6 +- .config/nvim/lua/plugins/lsp/gleam.lua | 2 +- .config/nvim/lua/plugins/lsp/go.lua | 4 +- .config/nvim/lua/plugins/lsp/htmlcss.lua | 4 +- .config/nvim/lua/plugins/lsp/json.lua | 6 +- .config/nvim/lua/plugins/lsp/lua_ls.lua | 4 +- .config/nvim/lua/plugins/lsp/nim.lua | 4 +- .config/nvim/lua/plugins/lsp/php.lua | 4 +- .config/nvim/lua/plugins/lsp/prisma.lua | 4 +- .config/nvim/lua/plugins/lsp/rust.lua | 2 +- .config/nvim/lua/plugins/lsp/svelte.lua | 4 +- .config/nvim/lua/plugins/lsp/tailwind.lua | 6 +- .config/nvim/lua/plugins/lsp/typescript.lua | 6 +- .config/nvim/lua/plugins/lsp/vue.lua | 4 +- .config/nvim/lua/plugins/lsp/yaml.lua | 4 +- .config/nvim/lua/plugins/lsp/zk.lua | 4 +- .config/nvim/lua/plugins/nvim-cmp.lua | 2 +- .config/nvim/lua/plugins/snacks.lua | 9 +- .config/nvim/lua/plugins/theme.lua | 10 +- 32 files changed, 139 insertions(+), 116 deletions(-) rename .config/nvim/lua/{plugins/config => my_config}/catppuccin.lua (85%) rename .config/nvim/lua/{plugins/config => my_config}/gruber-darker.lua (100%) rename .config/nvim/lua/{plugins/config => my_config}/kangawa.lua (100%) rename .config/nvim/lua/{plugins/config => my_config}/nordic.lua (100%) rename .config/nvim/lua/{plugins/config => my_config}/onenord.lua (100%) rename .config/nvim/lua/{plugins/config => my_config}/tokyonight.lua (100%) rename .config/nvim/lua/{plugins/config => my_config}/util.lua (100%) diff --git a/.config/nvim/lua/plugins/config/catppuccin.lua b/.config/nvim/lua/my_config/catppuccin.lua similarity index 85% rename from .config/nvim/lua/plugins/config/catppuccin.lua rename to .config/nvim/lua/my_config/catppuccin.lua index 16898bf..db81a95 100644 --- a/.config/nvim/lua/plugins/config/catppuccin.lua +++ b/.config/nvim/lua/my_config/catppuccin.lua @@ -7,6 +7,13 @@ require('catppuccin').setup({ shade = 'dark', percentage = 0.15, -- percentage of the shade to apply to the inactive window }, + integrations = { + navic = { + enabled = true, + }, + blink_cmp = true, + fzf = true, + }, custom_highlights = function(colors) return { QuickScopePrimary = { fg = '#dfbb78', bg = '#505050', style = { 'underline', 'bold' } }, diff --git a/.config/nvim/lua/plugins/config/gruber-darker.lua b/.config/nvim/lua/my_config/gruber-darker.lua similarity index 100% rename from .config/nvim/lua/plugins/config/gruber-darker.lua rename to .config/nvim/lua/my_config/gruber-darker.lua diff --git a/.config/nvim/lua/plugins/config/kangawa.lua b/.config/nvim/lua/my_config/kangawa.lua similarity index 100% rename from .config/nvim/lua/plugins/config/kangawa.lua rename to .config/nvim/lua/my_config/kangawa.lua diff --git a/.config/nvim/lua/plugins/config/nordic.lua b/.config/nvim/lua/my_config/nordic.lua similarity index 100% rename from .config/nvim/lua/plugins/config/nordic.lua rename to .config/nvim/lua/my_config/nordic.lua diff --git a/.config/nvim/lua/plugins/config/onenord.lua b/.config/nvim/lua/my_config/onenord.lua similarity index 100% rename from .config/nvim/lua/plugins/config/onenord.lua rename to .config/nvim/lua/my_config/onenord.lua diff --git a/.config/nvim/lua/plugins/config/tokyonight.lua b/.config/nvim/lua/my_config/tokyonight.lua similarity index 100% rename from .config/nvim/lua/plugins/config/tokyonight.lua rename to .config/nvim/lua/my_config/tokyonight.lua diff --git a/.config/nvim/lua/plugins/config/util.lua b/.config/nvim/lua/my_config/util.lua similarity index 100% rename from .config/nvim/lua/plugins/config/util.lua rename to .config/nvim/lua/my_config/util.lua diff --git a/.config/nvim/lua/plugins/avante.lua b/.config/nvim/lua/plugins/avante.lua index 50e53d5..a29c006 100644 --- a/.config/nvim/lua/plugins/avante.lua +++ b/.config/nvim/lua/plugins/avante.lua @@ -41,7 +41,7 @@ return { version = false, build = 'make', opts = function() - vim.env.GEMINI_API_KEY = require('plugins.config.util').get_age_credentials 'gemini_api.age' + vim.env.GEMINI_API_KEY = require('my_config.util').get_age_credentials 'gemini_api.age' if not vim.env.GEMINI_API_KEY then return get_ollama_setup() end @@ -144,7 +144,7 @@ return { env = { url = 'https://glhf.chat', api_key = function() - return require('plugins.config.util').get_age_credentials 'glhf.age' + return require('my_config.util').get_age_credentials 'glhf.age' end, chat_url = '/api/openai/v1/chat/completions', }, diff --git a/.config/nvim/lua/plugins/blink-cmp.lua b/.config/nvim/lua/plugins/blink-cmp.lua index e432e56..3e8a9da 100644 --- a/.config/nvim/lua/plugins/blink-cmp.lua +++ b/.config/nvim/lua/plugins/blink-cmp.lua @@ -3,13 +3,14 @@ local trigger_text = ';' ---@type LazySpec return { 'Saghen/blink.cmp', - enabled = false, + enabled = true, version = '*', dependencies = { 'mikavilpas/blink-ripgrep.nvim', { 'folke/lazydev.nvim', ft = 'lua', -- only load on lua files + dependencies = { 'Bilal2453/luvit-meta' }, opts = { library = { 'lazy.nvim', @@ -19,7 +20,6 @@ return { }, }, }, - { 'Bilal2453/luvit-meta', lazy = true }, { 'L3MON4D3/LuaSnip', version = 'v2.*', @@ -64,6 +64,13 @@ return { [''] = { 'select_next', 'fallback' }, [''] = { 'select_next', 'snippet_forward', 'fallback' }, [''] = { 'select_prev', 'snippet_backward', 'fallback' }, + -- show with a list of providers + [''] = { + function(cmp) + cmp.show({ providers = { 'snippets' } }) + end, + 'fallback', + }, cmdline = { preset = 'enter', [''] = {}, @@ -88,12 +95,12 @@ return { }, sources = { default = { - 'lazydev', 'lsp', 'path', - 'snippets', 'buffer', + 'snippets', 'ripgrep', + 'lazydev', }, providers = { ripgrep = { @@ -111,77 +118,79 @@ return { lazydev = { name = 'LazyDev', module = 'lazydev.integrations.blink', - -- make lazydev completions top priority (see `:h blink.cmp`) - score_offset = 100, }, lsp = { - name = 'lsp', - enabled = true, + name = 'LSP', module = 'blink.cmp.sources.lsp', - kind = 'LSP', - fallbacks = { 'snippets', 'buffer' }, - score_offset = 95, -- the higher the number, the higher the priority + fallbacks = { 'lazydev' }, + score_offset = 150, -- the higher the number, the higher the priority + -- Filter text items from the LSP provider, since we have the buffer provider for that + transform_items = function(_, items) + for _, item in ipairs(items) do + if item.kind == require('blink.cmp.types').CompletionItemKind.Snippet then + item.score_offset = item.score_offset - 3 + end + end + + return vim.tbl_filter(function(item) + return item.kind ~= require('blink.cmp.types').CompletionItemKind.Text + end, items) + end, }, path = { name = 'Path', module = 'blink.cmp.sources.path', score_offset = 25, - fallbacks = { 'buffer' }, + -- fallbacks = { 'buffer' }, opts = { trailing_slash = false, label_trailing_slash = true, - get_cwd = function(context) - return vim.fn.expand(('#%d:p:h'):format(context.bufnr)) - end, - show_hidden_files_by_default = true, }, }, buffer = { name = 'Buffer', - enabled = true, module = 'blink.cmp.sources.buffer', min_keyword_length = 3, score_offset = 15, -- the higher the number, the higher the priority }, snippets = { - name = 'snippets', - enabled = true, - min_keyword_length = 2, + name = 'Snippets', module = 'blink.cmp.sources.snippets', - score_offset = 80, -- the higher the number, the higher the priority - -- Only show snippets if I type the trigger_text characters, so - -- to expand the "bash" snippet, if the trigger_text is ";" I have to - should_show_items = function() - local col = vim.api.nvim_win_get_cursor(0)[2] - local before_cursor = vim.api.nvim_get_current_line():sub(1, col) - -- NOTE: remember that `trigger_text` is modified at the top of the file - return before_cursor:match(trigger_text .. '%w*$') ~= nil - end, - -- After accepting the completion, delete the trigger_text characters - -- from the final inserted text - transform_items = function(_, items) - local col = vim.api.nvim_win_get_cursor(0)[2] - local before_cursor = vim.api.nvim_get_current_line():sub(1, col) - local trigger_pos = before_cursor:find(trigger_text .. '[^' .. trigger_text .. ']*$') - if trigger_pos then - for _, item in ipairs(items) do - item.textEdit = { - newText = item.insertText or item.label, - range = { - start = { line = vim.fn.line '.' - 1, character = trigger_pos - 1 }, - ['end'] = { line = vim.fn.line '.' - 1, character = col }, - }, - } - end - end - -- NOTE: After the transformation, I have to reload the luasnip source - -- Otherwise really crazy shit happens and I spent way too much time - -- figurig this out - vim.schedule(function() - require('blink.cmp').reload 'snippets' - end) - return items - end, + min_keyword_length = 2, + score_offset = 60, -- the higher the number, the higher the priority + -- -- Only show snippets if I type the trigger_text characters, so + -- -- to expand the "bash" snippet, if the trigger_text is ";" I have to + -- should_show_items = function() + -- local col = vim.api.nvim_win_get_cursor(0)[2] + -- local before_cursor = vim.api.nvim_get_current_line():sub(1, col) + -- -- NOTE: remember that `trigger_text` is modified at the top of the file + -- return before_cursor:match(trigger_text .. '%w*$') ~= nil + -- end, + -- -- After accepting the completion, delete the trigger_text characters + -- -- from the final inserted text + -- transform_items = function(_, items) + -- local col = vim.api.nvim_win_get_cursor(0)[2] + -- local before_cursor = vim.api.nvim_get_current_line():sub(1, col) + -- local trigger_pos = before_cursor:find(trigger_text .. '[^' .. trigger_text .. ']*$') + -- if trigger_pos then + -- for _, item in ipairs(items) do + -- item.textEdit = { + -- newText = item.insertText or item.label, + -- range = { + -- start = { line = vim.fn.line '.' - 1, character = trigger_pos - 1 }, + -- ['end'] = { line = vim.fn.line '.' - 1, character = col }, + -- }, + -- } + -- end + -- end + -- -- NOTE: After the transformation, I have to reload the luasnip source + -- -- Otherwise really crazy shit happens and I spent way too much time + -- -- figurig this out + -- vim.schedule(function() + -- require('blink.cmp').reload 'snippets' + -- end) + -- return items + -- end, }, }, cmdline = function() diff --git a/.config/nvim/lua/plugins/dial.lua b/.config/nvim/lua/plugins/dial.lua index ec1e00f..3e5029b 100644 --- a/.config/nvim/lua/plugins/dial.lua +++ b/.config/nvim/lua/plugins/dial.lua @@ -180,7 +180,7 @@ return { }, lua = { augend.integer.alias.decimal, -- nonnegative and negative decimal number - augend.constant.alias.bool, -- boolean value (true <-> false) + augend.constant.alias.bool, augend.constant.new({ elements = { 'and', 'or' }, word = true, -- if false, "sand" is incremented into "sor", "doctor" into "doctand", etc. diff --git a/.config/nvim/lua/plugins/fzf-lua.lua b/.config/nvim/lua/plugins/fzf-lua.lua index 99d8ba8..1310672 100644 --- a/.config/nvim/lua/plugins/fzf-lua.lua +++ b/.config/nvim/lua/plugins/fzf-lua.lua @@ -103,21 +103,21 @@ return { -- ['--tiebreak'] = 'end', }, winopts = { preview = { default = 'bat' } }, - hls = { - normal = hl_validate 'TelescopeNormal', - border = hl_validate 'TelescopeBorder', - title = hl_validate 'TelescopePromptTitle', - help_normal = hl_validate 'TelescopeNormal', - help_border = hl_validate 'TelescopeBorder', - preview_normal = hl_validate 'TelescopeNormal', - preview_border = hl_validate 'TelescopeBorder', - preview_title = hl_validate 'TelescopePreviewTitle', - -- builtin preview only - cursor = hl_validate 'Cursor', - cursorline = hl_validate 'TelescopeSelection', - cursorlinenr = hl_validate 'TelescopeSelection', - search = hl_validate 'IncSearch', - }, + -- hls = { + -- normal = hl_validate 'TelescopeNormal', + -- border = hl_validate 'TelescopeBorder', + -- title = hl_validate 'TelescopePromptTitle', + -- help_normal = hl_validate 'TelescopeNormal', + -- help_border = hl_validate 'TelescopeBorder', + -- preview_normal = hl_validate 'TelescopeNormal', + -- preview_border = hl_validate 'TelescopeBorder', + -- preview_title = hl_validate 'TelescopePreviewTitle', + -- -- builtin preview only + -- cursor = hl_validate 'Cursor', + -- cursorline = hl_validate 'TelescopeSelection', + -- cursorlinenr = hl_validate 'TelescopeSelection', + -- search = hl_validate 'IncSearch', + -- }, keymap = { fzf = { true, diff --git a/.config/nvim/lua/plugins/lsp/astrolsp.lua b/.config/nvim/lua/plugins/lsp/astrolsp.lua index 0a0855b..e1698cd 100644 --- a/.config/nvim/lua/plugins/lsp/astrolsp.lua +++ b/.config/nvim/lua/plugins/lsp/astrolsp.lua @@ -350,7 +350,7 @@ return { }, handlers = { function(server, opts) - opts.capabilities = require('plugins.config.util').get_lsp_capabilities(opts.capabilities) + opts.capabilities = require('my_config.util').get_lsp_capabilities(opts.capabilities) require('lspconfig')[server].setup(opts) end, efm = false, diff --git a/.config/nvim/lua/plugins/lsp/cpp.lua b/.config/nvim/lua/plugins/lsp/cpp.lua index 625e45d..ca431c3 100644 --- a/.config/nvim/lua/plugins/lsp/cpp.lua +++ b/.config/nvim/lua/plugins/lsp/cpp.lua @@ -3,7 +3,7 @@ return { { 'williamboman/mason.nvim', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'clangd', }) return opts @@ -12,7 +12,7 @@ return { { 'nvim-treesitter/nvim-treesitter', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'c', 'cpp', 'make', diff --git a/.config/nvim/lua/plugins/lsp/elixir.lua b/.config/nvim/lua/plugins/lsp/elixir.lua index 2d131e0..e42e39a 100644 --- a/.config/nvim/lua/plugins/lsp/elixir.lua +++ b/.config/nvim/lua/plugins/lsp/elixir.lua @@ -3,7 +3,7 @@ return { { 'williamboman/mason.nvim', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'elixir-ls', }) return opts @@ -12,7 +12,7 @@ return { { 'nvim-treesitter/nvim-treesitter', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'elixir', 'erlang', 'eex', @@ -34,7 +34,7 @@ return { elixir_ls = function(_, opts) local elixir = require 'elixir' local elixirls = require 'elixir.elixirls' - opts.capabilities = require('plugins.config.util').get_lsp_capabilities(opts.capabilities) + opts.capabilities = require('my_config.util').get_lsp_capabilities(opts.capabilities) elixir.setup({ nextls = { enable = false }, diff --git a/.config/nvim/lua/plugins/lsp/gleam.lua b/.config/nvim/lua/plugins/lsp/gleam.lua index 04ef6ba..1b32293 100644 --- a/.config/nvim/lua/plugins/lsp/gleam.lua +++ b/.config/nvim/lua/plugins/lsp/gleam.lua @@ -3,7 +3,7 @@ return { { 'nvim-treesitter/nvim-treesitter', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'gleam', }) return opts diff --git a/.config/nvim/lua/plugins/lsp/go.lua b/.config/nvim/lua/plugins/lsp/go.lua index b1eb1cf..eddad3c 100644 --- a/.config/nvim/lua/plugins/lsp/go.lua +++ b/.config/nvim/lua/plugins/lsp/go.lua @@ -3,7 +3,7 @@ return { { 'williamboman/mason.nvim', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'gopls', 'goimports', 'golangci-lint', @@ -14,7 +14,7 @@ return { { 'nvim-treesitter/nvim-treesitter', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'go', 'gomod', 'gosum', diff --git a/.config/nvim/lua/plugins/lsp/htmlcss.lua b/.config/nvim/lua/plugins/lsp/htmlcss.lua index 1840c70..3574812 100644 --- a/.config/nvim/lua/plugins/lsp/htmlcss.lua +++ b/.config/nvim/lua/plugins/lsp/htmlcss.lua @@ -3,7 +3,7 @@ return { { 'williamboman/mason.nvim', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'cspell', 'html-lsp', 'stylelint', @@ -19,7 +19,7 @@ return { { 'nvim-treesitter/nvim-treesitter', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'html', 'css', 'scss', diff --git a/.config/nvim/lua/plugins/lsp/json.lua b/.config/nvim/lua/plugins/lsp/json.lua index 964b64e..db3e821 100644 --- a/.config/nvim/lua/plugins/lsp/json.lua +++ b/.config/nvim/lua/plugins/lsp/json.lua @@ -3,7 +3,7 @@ return { { 'williamboman/mason.nvim', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'json-lsp', }) return opts @@ -12,7 +12,7 @@ return { { 'nvim-treesitter/nvim-treesitter', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'json', 'jsonc', 'json5', @@ -26,7 +26,7 @@ return { opts = { handlers = { jsonls = function(server, opts) - opts.capabilities = require('plugins.config.util').get_lsp_capabilities(opts.capabilities) + opts.capabilities = require('my_config.util').get_lsp_capabilities(opts.capabilities) opts.on_new_config = function(new_config) new_config.settings.json.schemas = new_config.settings.json.schemas or {} vim.list_extend(new_config.settings.json.schemas, require('schemastore').json.schemas()) diff --git a/.config/nvim/lua/plugins/lsp/lua_ls.lua b/.config/nvim/lua/plugins/lsp/lua_ls.lua index 8df9081..13cf18e 100644 --- a/.config/nvim/lua/plugins/lsp/lua_ls.lua +++ b/.config/nvim/lua/plugins/lsp/lua_ls.lua @@ -3,7 +3,7 @@ return { { 'williamboman/mason.nvim', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'lua-language-server', 'stylua', }) @@ -13,7 +13,7 @@ return { { 'nvim-treesitter/nvim-treesitter', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'lua', 'luadoc', }) diff --git a/.config/nvim/lua/plugins/lsp/nim.lua b/.config/nvim/lua/plugins/lsp/nim.lua index 4413a87..5642c44 100644 --- a/.config/nvim/lua/plugins/lsp/nim.lua +++ b/.config/nvim/lua/plugins/lsp/nim.lua @@ -3,7 +3,7 @@ return { { 'williamboman/mason.nvim', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'nimlangserver', }) return opts @@ -12,7 +12,7 @@ return { { 'nvim-treesitter/nvim-treesitter', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'nim', 'nim_format_string', }) diff --git a/.config/nvim/lua/plugins/lsp/php.lua b/.config/nvim/lua/plugins/lsp/php.lua index b69914e..85224e9 100644 --- a/.config/nvim/lua/plugins/lsp/php.lua +++ b/.config/nvim/lua/plugins/lsp/php.lua @@ -3,7 +3,7 @@ return { { 'williamboman/mason.nvim', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'phpcbf', 'phpstan', 'phpcs', @@ -34,7 +34,7 @@ return { ['.*%.blade%.php'] = 'blade', }, }) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'php', 'phpdoc', 'blade', diff --git a/.config/nvim/lua/plugins/lsp/prisma.lua b/.config/nvim/lua/plugins/lsp/prisma.lua index 70244ad..2f99d13 100644 --- a/.config/nvim/lua/plugins/lsp/prisma.lua +++ b/.config/nvim/lua/plugins/lsp/prisma.lua @@ -3,7 +3,7 @@ return { { 'williamboman/mason.nvim', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'prisma-language-server', }) return opts @@ -12,7 +12,7 @@ return { { 'nvim-treesitter/nvim-treesitter', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'prisma', }) return opts diff --git a/.config/nvim/lua/plugins/lsp/rust.lua b/.config/nvim/lua/plugins/lsp/rust.lua index 2547413..b03e92f 100644 --- a/.config/nvim/lua/plugins/lsp/rust.lua +++ b/.config/nvim/lua/plugins/lsp/rust.lua @@ -3,7 +3,7 @@ return { { 'nvim-treesitter/nvim-treesitter', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'rust', }) return opts diff --git a/.config/nvim/lua/plugins/lsp/svelte.lua b/.config/nvim/lua/plugins/lsp/svelte.lua index c82424b..ab13b70 100644 --- a/.config/nvim/lua/plugins/lsp/svelte.lua +++ b/.config/nvim/lua/plugins/lsp/svelte.lua @@ -3,7 +3,7 @@ return { { 'williamboman/mason.nvim', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'svelte-language-server', }) return opts @@ -12,7 +12,7 @@ return { { 'nvim-treesitter/nvim-treesitter', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'svelte', }) return opts diff --git a/.config/nvim/lua/plugins/lsp/tailwind.lua b/.config/nvim/lua/plugins/lsp/tailwind.lua index 9638c83..1b062f2 100644 --- a/.config/nvim/lua/plugins/lsp/tailwind.lua +++ b/.config/nvim/lua/plugins/lsp/tailwind.lua @@ -3,7 +3,7 @@ return { { 'williamboman/mason.nvim', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'tailwindcss-language-server', }) return opts @@ -12,7 +12,7 @@ return { { 'nvim-treesitter/nvim-treesitter', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'styled', }) return opts @@ -23,7 +23,7 @@ return { opts = { handlers = { tailwindcss = function(server, opts) - opts.capabilities = require('plugins.config.util').get_lsp_capabilities(opts.capabilities) + opts.capabilities = require('my_config.util').get_lsp_capabilities(opts.capabilities) opts.init_options = { userLanguages = { eelixir = 'html-eex', diff --git a/.config/nvim/lua/plugins/lsp/typescript.lua b/.config/nvim/lua/plugins/lsp/typescript.lua index 3736a2b..6dd5e27 100644 --- a/.config/nvim/lua/plugins/lsp/typescript.lua +++ b/.config/nvim/lua/plugins/lsp/typescript.lua @@ -4,7 +4,7 @@ return { { 'williamboman/mason.nvim', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'vtsls', 'css-lsp', 'prettierd', @@ -17,7 +17,7 @@ return { { 'nvim-treesitter/nvim-treesitter', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'astro', 'javascript', 'typescript', @@ -60,7 +60,7 @@ return { vtsls = function(server, opts) require('lspconfig.configs').vtsls = require('vtsls').lspconfig local default_attach = opts.on_attach - opts.capabilities = require('plugins.config.util').get_lsp_capabilities(opts.capabilities) + opts.capabilities = require('my_config.util').get_lsp_capabilities(opts.capabilities) opts.filetypes = { 'javascript', 'javascriptreact', diff --git a/.config/nvim/lua/plugins/lsp/vue.lua b/.config/nvim/lua/plugins/lsp/vue.lua index 36f9359..169c4ce 100644 --- a/.config/nvim/lua/plugins/lsp/vue.lua +++ b/.config/nvim/lua/plugins/lsp/vue.lua @@ -3,7 +3,7 @@ return { { 'williamboman/mason.nvim', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'vue-language-server', 'vtsls', }) @@ -13,7 +13,7 @@ return { { 'nvim-treesitter/nvim-treesitter', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'vue', }) return opts diff --git a/.config/nvim/lua/plugins/lsp/yaml.lua b/.config/nvim/lua/plugins/lsp/yaml.lua index 2a2538a..a712f0f 100644 --- a/.config/nvim/lua/plugins/lsp/yaml.lua +++ b/.config/nvim/lua/plugins/lsp/yaml.lua @@ -2,7 +2,7 @@ return { { 'williamboman/mason.nvim', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'yaml-language-server', }) return opts @@ -11,7 +11,7 @@ return { { 'nvim-treesitter/nvim-treesitter', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'yaml', }) return opts diff --git a/.config/nvim/lua/plugins/lsp/zk.lua b/.config/nvim/lua/plugins/lsp/zk.lua index b0c57a5..f05ac04 100644 --- a/.config/nvim/lua/plugins/lsp/zk.lua +++ b/.config/nvim/lua/plugins/lsp/zk.lua @@ -83,7 +83,7 @@ local config = { { 'williamboman/mason.nvim', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'zk', }) return opts @@ -93,7 +93,7 @@ local config = { { 'nvim-treesitter/nvim-treesitter', opts = function(_, opts) - opts.ensure_installed = require('plugins.config.util').unique_append_table(opts.ensure_installed, { + opts.ensure_installed = require('my_config.util').unique_append_table(opts.ensure_installed, { 'markdown', 'markdown_inline', 'comment', diff --git a/.config/nvim/lua/plugins/nvim-cmp.lua b/.config/nvim/lua/plugins/nvim-cmp.lua index 47597da..96f16e8 100644 --- a/.config/nvim/lua/plugins/nvim-cmp.lua +++ b/.config/nvim/lua/plugins/nvim-cmp.lua @@ -34,7 +34,7 @@ end return { 'iguanacucumber/magazine.nvim', name = 'nvim-cmp', -- Otherwise highlighting gets messed up - enabled = true, + enabled = false, event = 'BufReadPre', dependencies = { 'hrsh7th/cmp-nvim-lsp', diff --git a/.config/nvim/lua/plugins/snacks.lua b/.config/nvim/lua/plugins/snacks.lua index 6663b36..4d0ac64 100644 --- a/.config/nvim/lua/plugins/snacks.lua +++ b/.config/nvim/lua/plugins/snacks.lua @@ -32,7 +32,6 @@ return { }, }, }, - keys = { { 'gg', @@ -74,4 +73,12 @@ return { -- { "lR", function() Snacks.rename.rename_file() end, desc = "Rename File" }, }, + init = function() + vim.api.nvim_create_user_command('NotificationHistory', function() + if not _G.Snacks then + return + end + Snacks.notifier.show_history() + end, { desc = 'Show Notification History' }) + end, } diff --git a/.config/nvim/lua/plugins/theme.lua b/.config/nvim/lua/plugins/theme.lua index 2eae28c..e30488b 100644 --- a/.config/nvim/lua/plugins/theme.lua +++ b/.config/nvim/lua/plugins/theme.lua @@ -6,7 +6,7 @@ return { event = 'VimEnter', enabled = true, config = function() - require 'plugins.config.catppuccin' + require 'my_config.catppuccin' end, }, { @@ -14,7 +14,7 @@ return { event = 'VimEnter', enabled = false, config = function() - require 'plugins.config.kangawa' + require 'my_config.kangawa' end, }, { @@ -22,7 +22,7 @@ return { enabled = false, event = 'VimEnter', config = function() - require 'plugins.config.gruber-darker' + require 'my_config.gruber-darker' end, }, { @@ -30,7 +30,7 @@ return { enabled = false, event = 'VimEnter', config = function() - require 'plugins.config.tokyonight' + require 'my_config.tokyonight' end, }, { @@ -52,7 +52,7 @@ return { enabled = false, event = 'VimEnter', config = function() - require 'plugins.config.nordic' + require 'my_config.nordic' end, }, }