diff --git a/init.vim b/init.vim index 49c010f..57de09b 100755 --- a/init.vim +++ b/init.vim @@ -32,7 +32,9 @@ source ~/.config/nvim/plugin-confs/lspconfig.lua source ~/.config/nvim/plugin-confs/lsplines.lua source ~/.config/nvim/plugin-confs/null-ls.lua source ~/.config/nvim/plugin-confs/nvim-cmp.lua +source ~/.config/nvim/plugin-confs/luasnip.lua source ~/.config/nvim/plugin-confs/fidget.lua +source ~/.config/nvim/plugin-confs/rainbow-delimiters.lua " source ~/.config/nvim/plugin-confs/symbols-outline.lua " source ~/.config/nvim/plugin-confs/chatgpt.lua source ~/.config/nvim/plugin-confs/nvim-colorizer.lua diff --git a/lua/plugins.lua b/lua/plugins.lua index 24120f9..395124f 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -228,10 +228,14 @@ require('packer').startup(function(use) "iamcco/markdown-preview.nvim", run = function() vim.fn["mkdp#util#install"]() end }) - - use 'L3MON4D3/LuaSnip' - use 'folke/neodev.nvim' - use 'saadparwaiz1/cmp_luasnip' + use { + "L3MON4D3/LuaSnip", + -- tag = "v2.*", + run = "make install_jsregexp", + dependencies = { "rafamadriz/friendly-snippets" } + } + use { 'folke/neodev.nvim' } + use { 'saadparwaiz1/cmp_luasnip' } use { 'hrsh7th/cmp-buffer' } use { 'hrsh7th/cmp-cmdline' } use { 'hrsh7th/cmp-nvim-lsp' } @@ -293,6 +297,7 @@ require('packer').startup(function(use) use { 'lewis6991/gitsigns.nvim' } use { 'rcarriga/nvim-notify' } use { 'stevearc/dressing.nvim' } + use { 'HiPhish/rainbow-delimiters.nvim' } -- }}} diff --git a/plugin-confs/lspconfig.lua b/plugin-confs/lspconfig.lua index 3999f36..c4aa30d 100644 --- a/plugin-confs/lspconfig.lua +++ b/plugin-confs/lspconfig.lua @@ -44,8 +44,8 @@ local on_attach = function(client, bufnr) -- end end -vim.cmd [[autocmd! ColorScheme * highlight NormalFloat guibg=#1f2335]] -vim.cmd [[autocmd! ColorScheme * highlight FloatBorder guifg=white guibg=#1f2335]] +-- vim.cmd [[autocmd! ColorScheme * highlight NormalFloat guibg=#1f2335]] +-- vim.cmd [[autocmd! ColorScheme * highlight FloatBorder guifg=white guibg=#1f2335]] -- squared corners diff --git a/plugin-confs/luasnip.lua b/plugin-confs/luasnip.lua new file mode 100644 index 0000000..80309d7 --- /dev/null +++ b/plugin-confs/luasnip.lua @@ -0,0 +1 @@ +require("luasnip.loaders.from_vscode").lazy_load() diff --git a/plugin-confs/nvim-cmp.lua b/plugin-confs/nvim-cmp.lua index 55ed0b4..6a81617 100644 --- a/plugin-confs/nvim-cmp.lua +++ b/plugin-confs/nvim-cmp.lua @@ -5,6 +5,7 @@ local lspconfig = require('lspconfig') -- luasnip setup local luasnip = require 'luasnip' local highlight = require('cmp.utils.highlight') + local capabilities = require('cmp_nvim_lsp').default_capabilities() local has_words_before = function() @@ -13,13 +14,13 @@ local has_words_before = function() end local line, col = unpack(vim.api.nvim_win_get_cursor(0)) return col ~= 0 and - vim.api.nvim_buf_get_text(0, line - 1, 0, line - 1, col, {})[1]:match( - "^%s*$") == nil + vim.api.nvim_buf_get_text(0, line - 1, 0, line - 1, col, {})[1]:match( + "^%s*$") == nil end -lspkind.init({ symbol_map = { Copilot = "" } }) +lspkind.init({symbol_map = {Copilot = ""}}) -vim.api.nvim_set_hl(0, "CmpItemKindCopilot", { fg = "#6CC644" }) +vim.api.nvim_set_hl(0, "CmpItemKindCopilot", {fg = "#6CC644"}) cmp.setup({ snippet = { @@ -42,7 +43,7 @@ cmp.setup({ else fallback() end - end, { 'i', 's' }), + end, {'i', 's'}), [''] = cmp.mapping(function(fallback) if cmp.visible() then cmp.select_next_item() @@ -53,7 +54,7 @@ cmp.setup({ else fallback() end - end, { 'i', 's' }), + end, {'i', 's'}), [''] = cmp.mapping.scroll_docs(-4), [''] = cmp.mapping.scroll_docs(4), [''] = cmp.mapping.complete(), @@ -73,7 +74,7 @@ cmp.setup({ -- end, { "i", "s" }), [""] = vim.schedule_wrap(function(fallback) if cmp.visible() and has_words_before() then - cmp.select_next_item({ behavior = cmp.SelectBehavior.Select }) + cmp.select_next_item({behavior = cmp.SelectBehavior.Select}) elseif luasnip.expand_or_jumpable() then luasnip.expand_or_jump() else @@ -82,7 +83,7 @@ cmp.setup({ end), [''] = cmp.mapping(function() if cmp.visible() then cmp.select_prev_item() end - end, { "i", "s" }) + end, {"i", "s"}) }, window = { completion = { @@ -105,7 +106,7 @@ cmp.setup({ formatting = { -- options: 'text', 'text_symbol', 'symbol_text', 'symbol' -- mode = 'symbol_text', - fields = { "kind", "abbr", "menu" }, + fields = {"kind", "abbr", "menu"}, format = function(entry, vim_item) local kind = require("lspkind").cmp_format({ mode = "symbol_text", @@ -138,7 +139,7 @@ cmp.setup({ TypeParameter = "󰅲" } })(entry, vim_item) - local strings = vim.split(kind.kind, "%s", { trimempty = true }) + local strings = vim.split(kind.kind, "%s", {trimempty = true}) kind.kind = " " .. strings[1] .. " " kind.menu = " (" .. strings[2] .. ")" @@ -156,13 +157,13 @@ cmp.setup({ -- }) }, sources = cmp.config.sources({ - { name = "copilot", group_index = 2 }, { name = "path", group_index = 2 }, - { name = 'nvim_lsp', group_index = 2 }, - { name = 'nvim_lsp_signature_help', group_index = 2 }, - { name = 'nvim_lsp_document_symbol', group_index = 2 }, - { name = 'vim-dadbod-completion', group_index = 2 }, - { name = 'neorg', group_index = 2 }, -- For luasnip users. - { name = 'luasnip', group_index = 2 }, -- For luasnip users. + {name = "copilot", group_index = 2}, {name = "path", group_index = 2}, + {name = 'nvim_lsp', group_index = 2}, + {name = 'nvim_lsp_signature_help', group_index = 2}, + {name = 'nvim_lsp_document_symbol', group_index = 2}, + {name = 'vim-dadbod-completion', group_index = 2}, + {name = 'neorg', group_index = 2}, -- For luasnip users. + {name = 'luasnip', group_index = 2}, -- For luasnip users. { name = 'buffer', option = { @@ -177,7 +178,7 @@ cmp.setup({ } -- { name = 'ultisnips' }, -- For ultisnips users. -- { name = 'snippy' }, -- For snippy users. - }, { { name = 'buffer' } }), + }, {{name = 'buffer'}}), sorting = { priority_weight = 2, comparators = { @@ -202,13 +203,13 @@ cmp.setup({ cmp.setup.cmdline('/', { mapping = cmp.mapping.preset.cmdline(), - sources = { { name = 'buffer' } } + sources = {{name = 'buffer'}} }) cmp.setup.cmdline(':', { mapping = cmp.mapping.preset.cmdline(), - sources = cmp.config.sources({ { name = 'path' } }, { - { name = 'cmdline', option = { ignore_cmds = { 'Man', '!' } } } + sources = cmp.config.sources({{name = 'path'}}, { + {name = 'cmdline', option = {ignore_cmds = {'Man', '!'}}} }) }) @@ -220,15 +221,16 @@ for _, lsp in ipairs(servers) do if lsp == 'lua_ls' then lspconfig[lsp].setup { -- on_attach = my_custom_on_attach, + -- on_attach = highlight_symbol_under_cursor(), capabilities = capabilities, callSnippet = "Replace" } else - lspconfig[lsp].setup { capabilities = capabilities } + lspconfig[lsp].setup {capabilities = capabilities} end end cmp.event:on("menu_opened", - function() vim.b.copilot_suggestion_hidden = true end) + function() vim.b.copilot_suggestion_hidden = true end) cmp.event:on("menu_closed", - function() vim.b.copilot_suggestion_hidden = false end) + function() vim.b.copilot_suggestion_hidden = false end) diff --git a/plugin-confs/nvim-notify.lua b/plugin-confs/nvim-notify.lua index b52a643..52d25fa 100644 --- a/plugin-confs/nvim-notify.lua +++ b/plugin-confs/nvim-notify.lua @@ -1,5 +1,5 @@ require("notify").setup({ - background_colour = "NotifyBackground", + background_colour = "#000000", fps = 144, icons = { DEBUG = "", diff --git a/plugin-confs/rainbow-delimiters.lua b/plugin-confs/rainbow-delimiters.lua new file mode 100644 index 0000000..82e5f6d --- /dev/null +++ b/plugin-confs/rainbow-delimiters.lua @@ -0,0 +1,15 @@ +-- This module contains a number of default definitions +local rainbow_delimiters = require 'rainbow-delimiters' + +vim.g.rainbow_delimiters = { + strategy = { + [''] = rainbow_delimiters.strategy['global'], + vim = rainbow_delimiters.strategy['local'] + }, + query = { [''] = 'rainbow-delimiters', lua = 'rainbow-blocks' }, + highlight = { + 'RainbowDelimiterRed', 'RainbowDelimiterYellow', 'RainbowDelimiterBlue', + 'RainbowDelimiterOrange', 'RainbowDelimiterGreen', + 'RainbowDelimiterViolet', 'RainbowDelimiterCyan' + } +}