more things!!!!!!

This commit is contained in:
2025-12-20 01:57:37 +07:00
parent 1e969b43a0
commit eb72445d5c
10 changed files with 177 additions and 89 deletions

View File

@@ -1,3 +1,32 @@
-- stylua: ignore
local colors = {
blue = '#80a0ff',
cyan = '#79dac8',
black = '#080808',
white = '#c6c6c6',
red = '#ff5189',
violet = '#d183e8',
grey = '#303030',
}
local bubbles_theme = {
normal = {
a = { fg = colors.black, bg = colors.violet },
b = { fg = colors.white, bg = colors.grey },
c = { fg = colors.white },
},
insert = { a = { fg = colors.black, bg = colors.blue } },
visual = { a = { fg = colors.black, bg = colors.cyan } },
replace = { a = { fg = colors.black, bg = colors.red } },
inactive = {
a = { fg = colors.white, bg = colors.black },
b = { fg = colors.white, bg = colors.black },
c = { fg = colors.white },
},
}
-- A blazing fast and easy to configure
-- neovim statusline plugin written in pure lua
-- @todo навести порядок
@@ -16,7 +45,9 @@ return {
-- A Git wrapper so awesome, it should be illegal
{ 'tpope/vim-fugitive' }
},
opts = {
config = function()
require('lualine').setup {
options = {
icons_enabled = true,
theme = 'auto',
component_separators = { left = '', right = ''},
@@ -49,21 +80,11 @@ return {
}
},
sections = {
lualine_a = {
'mode',
icons_enabled = true,
icon = nil,
separator = nil,
cond = nil,
color = nil,
--type = var(g:coc_status/bo:modifiable),
padding = 1,
fmt = nil,
on_click = nil,
},
lualine_a = {'mode'},
lualine_b = {'branch', 'diff'},
lualine_c = {'filename', 'lsp_progress'},
lualine_x = { FugitiveStatusline, 'encoding', 'fileformat', 'filetype'},
lualine_x = { 'encoding', 'fileformat', 'filetype'},
-- lualine_x = { FugitiveStatusline, 'encoding', 'fileformat', 'filetype'},
-- lualine_x = { FugitiveHead, 'encoding', 'fileformat', 'filetype'},
lualine_y = {'progress'},
lualine_z = {'location'}
@@ -84,22 +105,24 @@ return {
'nvim-dap-ui',
'trouble',
'neo-tree'
},
-- config = function()
-- local trouble = require("trouble")
-- local symbols = trouble.statusline({
-- mode = "lsp_document_symbols",
-- groups = {},
-- title = false,
-- filter = { range = true },
-- format = "{kind_icon}{symbol.name:Normal}",
-- -- The following line is needed to fix the background color
-- -- Set it to the lualine section you want to use
-- hl_group = "lualine_c_normal",
-- })
-- table.insert(opts.sections.lualine_c, {
-- symbols.get,
-- cond = symbols.has,
-- })
-- end
}
}
--[[ config = function()
local trouble = require("trouble")
local symbols = trouble.statusline({
mode = "lsp_document_symbols",
groups = {},
title = false,
filter = { range = true },
format = "{kind_icon}{symbol.name:Normal}",
-- The following line is needed to fix the background color
-- Set it to the lualine section you want to use
hl_group = "lualine_c_normal",
})
table.insert(opts.sections.lualine_c, {
symbols.get,
cond = symbols.has,
})
end ]]
end
}

View File

@@ -5,7 +5,6 @@ return {
lazy = false,
priority = 110,
opts = {
override = {},
color_icons = true,
default = true,
strict = true

View File

@@ -4,5 +4,73 @@ return {
'tummetott/reticle.nvim',
enabled = true,
lazy = true,
event = 'VeryLazy'
event = 'VeryLazy',
opts = {
-- Enable/Disable the cursorline and/or cursorcolumn at startup
on_startup = {
cursorline = true,
cursorcolumn = false,
},
-- Disable the cursorline and cursorcolumn in insert mode
disable_in_insert = false,
-- Disable the cursorline and cursorcolumn in diff mode
disable_in_diff = false,
-- By default, nvim highlights the cursorline number only when the
-- cursorline setting is active. Enabling this setting ensures that the
-- cursorline number in every window is always highlighted, regardless of
-- the cursorline setting. See: ':h cursorlineopt'
always_highlight_number = false,
-- Cursorline and/or cursorcolumn are set to be displayed exclusively in
-- the active window, thus following your active window. This setting is
-- overruled by the following settings concerning special filetypes.
follow = {
cursorline = true,
cursorcolumn = true,
},
-- Specify filetypes where the cursorline and/or cursorcolumn are always
-- enabled, regardless of the global setting.
always = {
cursorline = {},
cursorcolumn = {},
},
-- Specify filetypes where the cursorline and/or cursorcolumn are always
-- enabled when the window is focused, regardless of the global setting.
on_focus = {
cursorline = {},
cursorcolumn = {},
},
-- Define filetypes which are ignored by the plugin
ignore = {
cursorline = {
'DressingInput',
'FTerm',
'NvimSeparator',
'NvimTree',
'neo-tree',
'TelescopePrompt',
'Trouble',
},
cursorcolumn = {
'neo-tree',
},
},
-- Specify filetypes where the cursorline and/or cursorcolumn should be
-- explicitly disabled. Typically, you would include these filetypes in
-- the 'ignored' table. However, there are situations where plugins enable
-- cursorline/cursorcolumn without offering a configuration option for
-- disabling them. By adding these filetypes to the 'never' table, you
-- can override the plugin's settings and turn off these features.
never = {
cursorline = {},
cursorcolumn = {},
}
}
}

View File

@@ -5,10 +5,10 @@ return {
enabled = true,
lazy = true,
keys = {
{ '<c-f>', '<cmd>Telescope find_files', mode = { 'n', 'i', 'v', 't' }, desc = 'Telescope find', noremap = true, silent = true },
{ '<c-F>', '<cmd>Telescope live_grep', mode = { 'n', 'i', 'v', 't' }, desc = 'Telescope grep', noremap = true, silent = true },
{ '<leader><s-tab>', '<cmd>Telescope buffers', mode = { 'n', 'i', 'v', 't' }, desc = 'Telescope buffers', noremap = true, silent = true },
{ '<leader>?', '<cmd>Telescope help_tags', mode = { 'n', 'i', 'v', 't' }, desc = 'Telescope help', noremap = true, silent = true },
{ '<c-f>', '<cmd>Telescope find_files<cr>', mode = { 'n', 'i', 'v', 't' }, desc = 'Telescope find', noremap = true, silent = true },
{ '<c-g>', '<cmd>Telescope live_grep<cr>', mode = { 'n', 'i', 'v', 't' }, desc = 'Telescope grep', noremap = true, silent = true },
{ '<leader><s-tab>', '<cmd>Telescope buffers<cr>', mode = { 'n', 'i', 'v', 't' }, desc = 'Telescope buffers', noremap = true, silent = true },
{ '<leader>?', '<cmd>Telescope help_tags<cr>', mode = { 'n', 'i', 'v', 't' }, desc = 'Telescope help', noremap = true, silent = true },
},
dependencies = {
-- Functions for Telescope

View File

@@ -4,11 +4,16 @@
return {
'folke/trouble.nvim',
enabled = true,
lazy = true,
lazy = false,
cmd = 'Trouble',
keys = {
{ '<f3>', '<cmd>Trouble diagnostics toggle<cr>', mode = { 'n', 'i', 'v', 't' }, desc = 'Diagnostics (Trouble)', noremap = true, silent = true },
},
opts = {},
config = function() end
dependencies = {
-- Nvim Treesitter configurations and abstraction layer
{ 'nvim-treesitter/nvim-treesitter' },
-- Provides Nerd Font icons (glyphs) for use by neovim plugins
{ 'nvim-tree/nvim-web-devicons' }
}
}