summaryrefslogtreecommitdiffstats
path: root/.config/nvim
diff options
context:
space:
mode:
Diffstat (limited to '.config/nvim')
-rw-r--r--.config/nvim/lua/config/bindings.lua6
-rw-r--r--.config/nvim/lua/plugins/lspkind.lua12
-rw-r--r--.config/nvim/lua/plugins/lualine.lua146
3 files changed, 57 insertions, 107 deletions
diff --git a/.config/nvim/lua/config/bindings.lua b/.config/nvim/lua/config/bindings.lua
index 6ddb52a..5821e5f 100644
--- a/.config/nvim/lua/config/bindings.lua
+++ b/.config/nvim/lua/config/bindings.lua
@@ -61,11 +61,11 @@ vim.keymap.set('n', '<leader>fs', fzf.live_grep_native, { noremap = true, silent
vim.keymap.set('n', '<leader>fr', function() fzf.live_grep_native({resume = true}) end, { noremap = true, silent = true })
vim.keymap.set('n', '<leader>ft', ':TodoFzfLua keywords=TODO,HACK,WARN,PERF,NOTE,TEST,FIX<CR>', { noremap = true, silent = true })
-- neovim
-vim.keymap.set('n', '<leader>vu', ':Lazy sync', { noremap = true, silent = true })
+vim.keymap.set('n', '<leader>vu', ':Lazy sync<CR>', { noremap = true, silent = true })
vim.keymap.set('n', '<leader>vv', vim.cmd.Ex, { noremap = true, silent = true })
-- lsp
vim.keymap.set('n', '<leader>rr', fzf.lsp_references, { noremap = true, silent = true })
-vim.keymap.set('n', '<leader>re', fzf.lsp_definitions, { noremap = true, silent = true })
+vim.keymap.set('n', '<leader>rw', fzf.lsp_definitions, { noremap = true, silent = true })
vim.keymap.set('n', '<leader>ri', fzf.lsp_implementations, { noremap = true, silent = true })
vim.keymap.set('n', '<leader>rt', fzf.lsp_typedefs, { noremap = true, silent = true })
-vim.keymap.set('n', '<leader>rd', fzf.lsp_document_symbols, { noremap = true, silent = true })
+vim.keymap.set('n', '<leader>re', fzf.lsp_document_symbols, { noremap = true, silent = true })
diff --git a/.config/nvim/lua/plugins/lspkind.lua b/.config/nvim/lua/plugins/lspkind.lua
index b1fc6d1..e838f56 100644
--- a/.config/nvim/lua/plugins/lspkind.lua
+++ b/.config/nvim/lua/plugins/lspkind.lua
@@ -46,6 +46,8 @@ return {
},
event = "InsertEnter",
config = function()
+ vim.api.nvim_set_hl(0, "CmpNormal", { bg = "#32302f" })
+ vim.api.nvim_set_hl(0, "PmenuSel", { bg = "#504945" })
local cmp = require('cmp')
local lspkind = require('lspkind')
@@ -93,8 +95,14 @@ return {
{ name = 'path' },
}),
window = {
- completion = cmp.config.window.bordered(),
- documentation = cmp.config.window.bordered(),
+ completion = cmp.config.window.bordered({
+ border = 'none',
+ winhighlight = "Normal:CmpNormal,FloatBorder:CmpNormal,CursorLine:PmenuSel,Search:None",
+ }),
+ documentation = cmp.config.window.bordered({
+ 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 4c2c6d3..b2a92d0 100644
--- a/.config/nvim/lua/plugins/lualine.lua
+++ b/.config/nvim/lua/plugins/lualine.lua
@@ -4,17 +4,47 @@ return {
dependencies = { 'nvim-tree/nvim-web-devicons' },
config = function()
local colors = {
- bg = '#202328',
- fg = '#a89984',
- yellow = '#ecbe7b',
- cyan = '#008080',
- darkblue = '#081633',
- green = '#98be65',
- orange = '#ff8800',
- violet = '#a9a1e1',
- magenta = '#c678dd',
- blue = '#51afef',
- red = '#ec5f67',
+ bg = '#32302f',
+ fg = '#a89984',
+ orange = '#fe8019',
+ violet = '#a9a1e1',
+ red = '#cc241d',
+ green = '#98971a',
+ yellow = '#d79921',
+ blue = '#458588',
+ magenta = '#b16286',
+ cyan = '#689d6a',
+ white = '#ebdbb2',
+ bright_red = '#fb4934',
+ bright_green = '#b8bb26',
+ bright_yellow = '#fabd2f',
+ bright_blue = '#83a598',
+ bright_magenta = '#d3869b',
+ bright_cyan = '#8ec07c',
+ bright_white = '#ebdbb2',
+ }
+
+ local mode_color = {
+ n = colors.bright_cyan,
+ i = colors.bright_blue,
+ v = colors.bright_magenta,
+ [''] = colors.bright_magenta,
+ V = colors.bright_magenta,
+ c = colors.yellow,
+ no = colors.red,
+ s = colors.orange,
+ S = colors.orange,
+ [''] = colors.orange,
+ ic = colors.yellow,
+ R = colors.bright_red,
+ Rv = colors.violet,
+ cv = colors.red,
+ ce = colors.red,
+ r = colors.cyan,
+ rm = colors.cyan,
+ ['r?'] = colors.cyan,
+ ['!'] = colors.red,
+ t = colors.red,
}
local conditions = {
@@ -82,28 +112,6 @@ return {
-- color = { fg = colors.green }, -- Sets highlighting of component
color = function()
-- auto change color according to neovims mode
- local mode_color = {
- n = colors.green,
- i = colors.blue,
- v = colors.magenta,
- [''] = colors.magenta,
- V = colors.magenta,
- c = colors.yellow,
- no = colors.red,
- s = colors.orange,
- S = colors.orange,
- [''] = colors.orange,
- ic = colors.yellow,
- R = colors.red,
- Rv = colors.violet,
- cv = colors.red,
- ce = colors.red,
- r = colors.cyan,
- rm = colors.cyan,
- ['r?'] = colors.cyan,
- ['!'] = colors.red,
- t = colors.red,
- }
return { fg = mode_color[vim.fn.mode()] }
end,
padding = { left = 0, right = 1 }, -- We don't need space before this
@@ -116,28 +124,6 @@ return {
end,
color = function()
-- auto change color according to neovims mode
- local mode_color = {
- n = colors.green,
- i = colors.blue,
- v = colors.magenta,
- [''] = colors.magenta,
- V = colors.magenta,
- c = colors.yellow,
- no = colors.red,
- s = colors.orange,
- S = colors.orange,
- [''] = colors.orange,
- ic = colors.yellow,
- R = colors.red,
- Rv = colors.violet,
- cv = colors.red,
- ce = colors.red,
- r = colors.cyan,
- rm = colors.cyan,
- ['r?'] = colors.cyan,
- ['!'] = colors.red,
- t = colors.red,
- }
return { fg = mode_color[vim.fn.mode()] }
end,
padding = { right = 1 },
@@ -158,28 +144,6 @@ return {
-- Same values as the general color option can be used here.
active = function()
-- auto change color according to neovims mode
- local mode_color = {
- n = colors.green,
- i = colors.blue,
- v = colors.magenta,
- [''] = colors.magenta,
- V = colors.magenta,
- c = colors.yellow,
- no = colors.red,
- s = colors.orange,
- S = colors.orange,
- [''] = colors.orange,
- ic = colors.yellow,
- R = colors.red,
- Rv = colors.violet,
- cv = colors.red,
- ce = colors.red,
- r = colors.cyan,
- rm = colors.cyan,
- ['r?'] = colors.cyan,
- ['!'] = colors.red,
- t = colors.red,
- }
return { fg = mode_color[vim.fn.mode()], gui = 'bold' }
end,
},
@@ -249,9 +213,9 @@ return {
-- Is it me or the symbol for modified us really weird
symbols = { added = ' ', modified = '󰝤 ', removed = ' ' },
diff_color = {
- added = { fg = colors.green },
- modified = { fg = colors.orange },
- removed = { fg = colors.red },
+ added = { fg = colors.bright_green },
+ modified = { fg = colors.yellow },
+ removed = { fg = colors.bright_red },
},
cond = conditions.hide_in_width,
}
@@ -265,28 +229,6 @@ return {
-- color = { fg = colors.green },
color = function()
-- auto change color according to neovims mode
- local mode_color = {
- n = colors.green,
- i = colors.blue,
- v = colors.magenta,
- [''] = colors.magenta,
- V = colors.magenta,
- c = colors.yellow,
- no = colors.red,
- s = colors.orange,
- S = colors.orange,
- [''] = colors.orange,
- ic = colors.yellow,
- R = colors.red,
- Rv = colors.violet,
- cv = colors.red,
- ce = colors.red,
- r = colors.cyan,
- rm = colors.cyan,
- ['r?'] = colors.cyan,
- ['!'] = colors.red,
- t = colors.red,
- }
return { fg = mode_color[vim.fn.mode()] }
end,
padding = { left = 1 },
powered by cgit. Copyright (c) 2020-2023, Joe - this website does not use cookies or php or js