diff options
Diffstat (limited to '.config/nvim')
| -rw-r--r-- | .config/nvim/lua/config/lazy.lua | 5 | ||||
| -rw-r--r-- | .config/nvim/lua/config/settings.lua | 25 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins/gruvbox.lua | 1 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins/lspkind.lua | 41 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins/lualine.lua | 40 | ||||
| -rw-r--r-- | .config/nvim/lua/plugins/trouble.lua | 27 |
6 files changed, 42 insertions, 97 deletions
diff --git a/.config/nvim/lua/config/lazy.lua b/.config/nvim/lua/config/lazy.lua index e9c3f22..38168cd 100644 --- a/.config/nvim/lua/config/lazy.lua +++ b/.config/nvim/lua/config/lazy.lua @@ -137,6 +137,11 @@ require('lazy').setup({ } } }, + { + 'folke/trouble.nvim', + opts = {}, + cmd = "Trouble", + }, { import = "plugins" }, }, }) diff --git a/.config/nvim/lua/config/settings.lua b/.config/nvim/lua/config/settings.lua index 2fceccc..aac3187 100644 --- a/.config/nvim/lua/config/settings.lua +++ b/.config/nvim/lua/config/settings.lua @@ -40,10 +40,6 @@ vim.opt.termguicolors = true vim.opt.bg = 'dark' vim.opt.guicursor:remove { 't:block-blinkon500-blinkoff500-TermCursor' } -vim.g.gruvbox_material_background = 'medium' -vim.g.gruvbox_material_foreground = 'original' -vim.g.gruvbox_material_better_performance = 1 - vim.cmd [[ syntax on @@ -92,3 +88,24 @@ vim.api.nvim_create_autocmd('TextYankPost', { group = highlight_group, pattern = '*', }) + +vim.diagnostic.enable = true + +vim.diagnostic.config({ + virtual_text = { + source = "if_many", + prefix = "|", + spacing = 2, + }, + signs = { + text = { + [vim.diagnostic.severity.ERROR] = "E:", + [vim.diagnostic.severity.WARN] = "W:", + [vim.diagnostic.severity.INFO] = "I:", + [vim.diagnostic.severity.HINT] = "H:", + }, + }, + underline = true, + update_in_insert = true, + severity_sort = true, +}) diff --git a/.config/nvim/lua/plugins/gruvbox.lua b/.config/nvim/lua/plugins/gruvbox.lua index bf99776..a1ffe02 100644 --- a/.config/nvim/lua/plugins/gruvbox.lua +++ b/.config/nvim/lua/plugins/gruvbox.lua @@ -24,6 +24,7 @@ return { contrast = "hard", -- can be "hard", "soft" or empty string palette_overrides = {}, overrides = { + ["@comment"] = { fg = "#928374", italic = false }, ["@punctuation.delimiter"] = { fg = "#928374" }, String = { fg = "#8ec07c" }, }, diff --git a/.config/nvim/lua/plugins/lspkind.lua b/.config/nvim/lua/plugins/lspkind.lua index e838f56..2a5165f 100644 --- a/.config/nvim/lua/plugins/lspkind.lua +++ b/.config/nvim/lua/plugins/lspkind.lua @@ -3,35 +3,8 @@ return { 'onsails/lspkind.nvim', config = function() require('lspkind').setup({ - mode = 'symbol_text', - preset = 'codicons', - symbol_map = { - Text = "", - Method = "", - Function = "", - Constructor = "", - Field = "", - Variable = "", - Class = "", - Interface = "", - Module = "", - Property = "", - Unit = "", - Value = "", - Enum = "", - Keyword = "", - Snippet = "", - Color = "", - File = "", - Reference = "", - Folder = "", - EnumMember = "", - Constant = "", - Struct = "", - Event = "", - Operator = "", - TypeParameter = "", - }, + mode = 'text', + preset = 'default', }) end }, @@ -59,7 +32,7 @@ return { }, formatting = { format = lspkind.cmp_format({ - mode = 'symbol_text', + mode = 'text', maxwidth = { menu = 50, abbr = 50, @@ -95,14 +68,14 @@ return { { name = 'path' }, }), window = { - completion = cmp.config.window.bordered({ + completion = { border = 'none', winhighlight = "Normal:CmpNormal,FloatBorder:CmpNormal,CursorLine:PmenuSel,Search:None", - }), - documentation = cmp.config.window.bordered({ + }, + documentation = { border = 'none', winhighlight = "Normal:CmpNormal,FloatBorder:CmpNormal,CursorLine:PmenuSel,Search:None", - }), + }, }, }) end, diff --git a/.config/nvim/lua/plugins/lualine.lua b/.config/nvim/lua/plugins/lualine.lua index 53d22ff..f6223c6 100644 --- a/.config/nvim/lua/plugins/lualine.lua +++ b/.config/nvim/lua/plugins/lualine.lua @@ -1,7 +1,6 @@ return { { 'nvim-lualine/lualine.nvim', - dependencies = { 'nvim-tree/nvim-web-devicons' }, config = function() local colors = { bg = '#32302f', @@ -108,7 +107,6 @@ return { function() return '▊' end, - -- color = { fg = colors.green }, -- Sets highlighting of component color = function() -- auto change color according to neovims mode return { fg = mode_color[vim.fn.mode()] } @@ -117,27 +115,14 @@ return { } ins_left { - -- mode component - function() - return '' - end, - color = function() - -- auto change color according to neovims mode - return { fg = mode_color[vim.fn.mode()] } - end, - padding = { right = 1 }, - } - - ins_left { 'buffers', show_filename_only = false, hide_filename_extension = false, show_modified_status = true, - icons_enabled = true, + icons_enabled = false, symbols = { - modified = ' ●', -- Text to show when the buffer is modified + modified = '+', -- Text to show when the buffer is modified alternate_file = '', -- Text to show to identify the alternate file - directory = '', -- Text to show when the buffer is a directory }, buffers_color = { -- Same values as the general color option can be used here. @@ -151,11 +136,11 @@ return { ins_left { 'diagnostics', sources = { 'nvim_diagnostic' }, - symbols = { error = ' ', warn = ' ', info = ' ' }, + symbols = { error = 'E:', warn = 'W:', info = 'I:' }, diagnostics_color = { color_error = { fg = colors.red }, color_warn = { fg = colors.yellow }, - color_info = { fg = colors.cyan }, + color_info = { fg = colors.blue }, }, } @@ -169,7 +154,7 @@ return { ins_right { 'filetype', - icons_enabled = true, -- I think icons are cool but Eviline doesn't have them. sigh + icons_enabled = false, -- I think icons are cool but Eviline doesn't have them. sigh color = { fg = colors.blue }, } @@ -180,7 +165,6 @@ return { local buf_ft = vim.api.nvim_buf_get_option(0, 'filetype') local clients = vim.lsp.get_clients() if next(clients) == nil then - icon = '' return '' end for _, client in ipairs(clients) do @@ -191,26 +175,19 @@ return { end return msg end, - icon = ' ', + icons_enabled = false, color = { fg = colors.cyan }, } ins_right { 'branch', - icon = '', + icons_enabled = false, color = { fg = colors.blue, gui = 'bold' }, } ins_right { - -- filesize component - 'filesize', - cond = conditions.buffer_not_empty, - } - - ins_right { 'diff', - -- Is it me or the symbol for modified us really weird - symbols = { added = ' ', modified = ' ', removed = ' ' }, + symbols = { added = '+', modified = '~', removed = '-' }, diff_color = { added = { fg = colors.bright_green }, modified = { fg = colors.yellow }, @@ -225,7 +202,6 @@ return { function() return '▊' end, - -- color = { fg = colors.green }, color = function() -- auto change color according to neovims mode return { fg = mode_color[vim.fn.mode()] } diff --git a/.config/nvim/lua/plugins/trouble.lua b/.config/nvim/lua/plugins/trouble.lua deleted file mode 100644 index 11c23a3..0000000 --- a/.config/nvim/lua/plugins/trouble.lua +++ /dev/null @@ -1,27 +0,0 @@ -return { - { - 'folke/trouble.nvim', - requires = { - {'nvim-tree/nvim-web-devicons'}, - }, - config = function() - require('trouble').setup { - -- icons = true, - } - - -- Diagnostic signs - -- https://github.com/folke/trouble.nvim/issues/52 - 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}) - end - end - } -} |