Compare commits

..

4 Commits

6 changed files with 55 additions and 32 deletions

View File

@ -52,6 +52,9 @@ return {
},
{
{ 'n' }, '<C-w><Right>', '<cmd>wincmd l<CR>', { desc = "Window Right" }
},
{
{ 'n', 'i' }, '<C-b>', '<cmd>Neotree toggle<CR>', { desc = "Toggle Neotree" }
}
}

View File

@ -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 = {

View File

@ -0,0 +1,10 @@
return {
{
"RRethy/vim-illuminate",
config = function (_, _)
require('illuminate').configure({
})
end
}
}

View File

@ -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
}
},
lualine_y = {'progress'},
'encoding',
'fileformat'
},
lualine_y = {
{ 'progress' }
},
lualine_z = {'location'}
},
inactive_sections = {

View File

@ -11,16 +11,6 @@ return {
local options = require("options")
return {
sources = {
"filesystem",
"buffers",
"git_status",
"document_symbols"
},
source_selector = {
winbar = true,
statusline = false
},
close_if_last_window = true,
popup_border_style = options.ui.border,
default_component_configs = {

View File

@ -15,10 +15,10 @@ return {
{
sign = {
name = { "Diagnostic" },
colwidth = 1,
maxwidth = 1,
condition = { true }
colwidth = 2,
maxwidth = 1
},
auto = true,
click = "v:lua.ScSa"
},
-- line numbers