From df75ab6508b787fbd949778b312c99ebdebd97be Mon Sep 17 00:00:00 2001 From: servostar Date: Fri, 15 Mar 2024 18:29:30 +0100 Subject: [PATCH] refined configuration --- lua/keymap.lua | 3 +++ lua/plugins/cokeline.lua | 17 +++++++++++----- lua/plugins/illuminate.lua | 10 ++++++++++ lua/plugins/lualine.lua | 41 +++++++++++++++++++++++++------------- 4 files changed, 52 insertions(+), 19 deletions(-) create mode 100644 lua/plugins/illuminate.lua diff --git a/lua/keymap.lua b/lua/keymap.lua index cb45f59..9691c5b 100644 --- a/lua/keymap.lua +++ b/lua/keymap.lua @@ -52,6 +52,9 @@ return { }, { { 'n' }, '', 'wincmd l', { desc = "Window Right" } + }, + { + { 'n', 'i' }, '', 'Neotree toggle', { desc = "Toggle Neotree" } } } diff --git a/lua/plugins/cokeline.lua b/lua/plugins/cokeline.lua index 8232c1d..34064e6 100644 --- a/lua/plugins/cokeline.lua +++ b/lua/plugins/cokeline.lua @@ -148,13 +148,13 @@ return { end, bg = function(tabpage) if tabpage.is_active then - return "NeoTreeTabActive" + return "lualine_a_command" end return "NeoTreeTabInactive" end, fg = function(tabpage) if tabpage.is_active then - return "NeoTreeTabActive" + return "lualine_a_command" end return "NeoTreeTabInactive" end @@ -170,17 +170,24 @@ return { tabpage:close() end, bg = function(_) - return "NeoTreeTabActive" + return "lualine_a_command" end, fg = function(_) - return "NeoTreeTabActive" + return "lualine_a_command" end } }, }, rhs = { { - text = "󰓩 2 tabs" + text = " ➕TAB ", + on_click = function(_, _, _, _, _) + vim.defer_fn(function() + vim.cmd("tabnew") + end, 100) + end, + fg = "NeoTreeTabActive", + bg = "NeoTreeTabActive" } }, sidebar = { diff --git a/lua/plugins/illuminate.lua b/lua/plugins/illuminate.lua new file mode 100644 index 0000000..a6c29cf --- /dev/null +++ b/lua/plugins/illuminate.lua @@ -0,0 +1,10 @@ +return { + { + "RRethy/vim-illuminate", + config = function (_, _) + require('illuminate').configure({ + + }) + end + } +} diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua index 73002e3..dedb3ac 100644 --- a/lua/plugins/lualine.lua +++ b/lua/plugins/lualine.lua @@ -52,10 +52,27 @@ return { added = '+', modified = '~', removed = '-', - } + }, + on_click = function () + vim.defer_fn(function() + vim.cmd("Gitsigns diffthis") + end, 100) + end, }, }, lualine_x = { + { + function () + local client_id = vim.lsp.get_client_by_id(1) + return ' LSP ~ ' .. client_id.name + end, + on_click = function () + vim.defer_fn(function() + vim.cmd("LspInfo") + end, 100) + end, + color = 'lualine_c_inactive' + }, { 'diagnostics', symbols = { @@ -67,21 +84,13 @@ return { sources = { 'nvim_diagnostic' }, - update_in_insert = true - }, - { - function () - local client_id = vim.lsp.get_client_by_id(1) - return ' LSP - ' .. client_id.name - end, + update_in_insert = true, on_click = function () vim.defer_fn(function() - vim.cmd("LspInfo") + vim.cmd("TroubleToggle") end, 100) - end + end, }, - 'encoding', - 'fileformat', { 'filetype', colored = true, @@ -90,9 +99,13 @@ return { vim.cmd("Telescope filetypes") end, 100) end - } + }, + 'encoding', + 'fileformat' + }, + lualine_y = { + { 'progress' } }, - lualine_y = {'progress'}, lualine_z = {'location'} }, inactive_sections = {