diff options
Diffstat (limited to 'lua/plugins')
| -rw-r--r-- | lua/plugins/cmp.lua | 2 | ||||
| -rw-r--r-- | lua/plugins/colorscheme.lua | 11 | ||||
| -rw-r--r-- | lua/plugins/interface.lua | 30 | ||||
| -rw-r--r-- | lua/plugins/lsp.lua | 32 | ||||
| -rw-r--r-- | lua/plugins/mini.lua | 33 | ||||
| -rw-r--r-- | lua/plugins/telescope.lua | 1 |
6 files changed, 53 insertions, 56 deletions
diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua index 3f7b6ea..4f9d8f4 100644 --- a/lua/plugins/cmp.lua +++ b/lua/plugins/cmp.lua @@ -24,7 +24,6 @@ return { 'hrsh7th/cmp-nvim-lsp', 'hrsh7th/cmp-buffer', 'FelipeLema/cmp-async-path', - 'hrsh7th/cmp-calc', 'saadparwaiz1/cmp_luasnip', 'L3MON4D3/LuaSnip', }, @@ -56,7 +55,6 @@ return { { name = 'luasnip' }, { name = 'buffer' }, { name = 'async_path' }, - { name = 'calc' }, }), formatting = { format = function(_, item) diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index a857143..42c977c 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -6,16 +6,13 @@ return { config = function() vim.opt.background = 'dark' require('monokai-pro').setup({ - plugins = { - indent_blankline = { - context_highlight = 'pro', - }, - }, + filter = 'octagon', override = function(c) return { - TelescopePromptNormal = { bg = c.base.dimmed3 }, + TelescopeSelection = { bg = c.base.dimmed3 }, + TelescopePromptNormal = { bg = c.base.dimmed3, fg = c.base.white }, TelescopePromptBorder = { bg = c.base.dimmed3, fg = c.base.dimmed3 }, - TelescopeResultsNormal = { bg = c.base.dimmed5 }, + TelescopeResultsNormal = { bg = c.base.dimmed5, fg = c.base.white }, TelescopeResultsBorder = { bg = c.base.dimmed5, fg = c.base.dimmed5 }, TelescopePreviewNormal = { bg = c.base.dimmed5 }, TelescopePreviewBorder = { bg = c.base.dimmed5, fg = c.base.dimmed5 }, diff --git a/lua/plugins/interface.lua b/lua/plugins/interface.lua index f5009f6..c1164d1 100644 --- a/lua/plugins/interface.lua +++ b/lua/plugins/interface.lua @@ -1,5 +1,8 @@ return { { + 'nvim-tree/nvim-web-devicons', + }, + { 'nvim-lualine/lualine.nvim', event = 'VeryLazy', opts = { @@ -51,31 +54,4 @@ return { { bg = require('monokai-pro.colorscheme').colors.editor.backgroundnil }) end, }, - { - 'lukas-reineke/indent-blankline.nvim', - event = { - 'BufReadPost', - 'BufNewFile' - }, - opts = { - show_current_context = true, - }, - }, - { - 'lewis6991/gitsigns.nvim', - event = { - 'BufReadPost', - 'BufNewFile' - }, - opts = { - signs = { - add = { text = ' │' }, - change = { text = ' │' }, - delete = { text = ' │' }, - topdelete = { text = ' │' }, - changedelete = { text = ' │' }, - untracked = { text = ' │' }, - }, - }, - }, } diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 668a80a..740e0cc 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -2,7 +2,7 @@ return { { 'neovim/nvim-lspconfig', event = { - 'BufReadPost', + 'BufReadPre', 'BufNewFile' }, dependencies = { @@ -11,27 +11,14 @@ return { 'hrsh7th/cmp-nvim-lsp', }, config = function() - require('mason').setup() - - require('mason-lspconfig').setup() - local lsp_capabilities = require('cmp_nvim_lsp').default_capabilities() - local lsp_attach = function(client, bufnr) - end - + local lsp_attach = function(client, bufnr) end local lspconfig = require('lspconfig') - require('mason-lspconfig').setup_handlers({ - function(server_name) - lspconfig[server_name].setup({ - on_attach = lsp_attach, - capabilities = lsp_capabilities, - }) - end, - }) local signs = { Error = " ", Warn = " ", Hint = " ", Info = " " } + for type, icon in pairs(signs) do local hl = "DiagnosticSign" .. type - vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl }) + vim.fn.sign_define(hl, { texthl = hl, numhl = hl }) end vim.diagnostic.config({ update_in_insert = true, @@ -53,6 +40,17 @@ return { vim.diagnostic.open_float(nil, opts) end }) + + require('mason').setup() + require('mason-lspconfig').setup() + require('mason-lspconfig').setup_handlers({ + function(server_name) + lspconfig[server_name].setup({ + on_attach = lsp_attach, + capabilities = lsp_capabilities, + }) + end, + }) end, }, } diff --git a/lua/plugins/mini.lua b/lua/plugins/mini.lua index 114e5bb..4284334 100644 --- a/lua/plugins/mini.lua +++ b/lua/plugins/mini.lua @@ -1,6 +1,6 @@ return { { - 'echasnovski/mini.nvim', + 'echasnovski/mini.sessions', event = 'VimEnter', keys = { { @@ -20,8 +20,18 @@ return { }, config = function() require('mini.sessions').setup({ - force = { read = false, write = true, delete = true } + force = { + read = false, + write = true, + delete = true, + }, }) + end, + }, + { + 'echasnovski/mini.starter', + event = 'VimEnter', + config = function() require('mini.starter').setup({ evaluate_single = true, silent = true, @@ -31,4 +41,23 @@ return { }) end, }, + { + 'echasnovski/mini.indentscope', + event = { + 'BufReadPre', + 'BufNewFile' + }, + config = function() + require('mini.indentscope').setup({ + draw = { + delay = 0, + animation = require('mini.indentscope').gen_animation.none(), + }, + options = { + try_as_border = true, + }, + symbol = '│', + }) + end, + }, } diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index 2ff3777..c95b7bc 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -9,7 +9,6 @@ return { }, dependencies = { 'nvim-lua/plenary.nvim', - 'nvim-tree/nvim-web-devicons', 'nvim-telescope/telescope-fzf-native.nvim', }, opts = { |