mirror of
https://github.com/pojokcodeid/nvim-lazy.git
synced 2025-06-23 01:08:53 +02:00
add: update config
This commit is contained in:
parent
1d2a590c80
commit
b95099877d
6 changed files with 709 additions and 704 deletions
|
@ -12,7 +12,6 @@
|
||||||
"codeium.vim": { "branch": "main", "commit": "9406f13cf3eaa08318b76746bd105a04506cab27" },
|
"codeium.vim": { "branch": "main", "commit": "9406f13cf3eaa08318b76746bd105a04506cab27" },
|
||||||
"dressing.nvim": { "branch": "master", "commit": "572314728cb1ce012e825fd66331f52c94acac12" },
|
"dressing.nvim": { "branch": "master", "commit": "572314728cb1ce012e825fd66331f52c94acac12" },
|
||||||
"friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" },
|
"friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" },
|
||||||
"github-nvim-theme": { "branch": "main", "commit": "66dcec1bd3d12f8b0bf3c885069888551a650049" },
|
|
||||||
"gitsigns.nvim": { "branch": "main", "commit": "76927d14d3fbd4ba06ccb5246e79d93b5442c188" },
|
"gitsigns.nvim": { "branch": "main", "commit": "76927d14d3fbd4ba06ccb5246e79d93b5442c188" },
|
||||||
"indent-blankline.nvim": { "branch": "master", "commit": "ece00d5fb44d196680a81fd2761062d2fa44663b" },
|
"indent-blankline.nvim": { "branch": "master", "commit": "ece00d5fb44d196680a81fd2761062d2fa44663b" },
|
||||||
"lazy.nvim": { "branch": "main", "commit": "758bb5de98b805acc5eeed8cdc8ac7f0bc4b0b86" },
|
"lazy.nvim": { "branch": "main", "commit": "758bb5de98b805acc5eeed8cdc8ac7f0bc4b0b86" },
|
||||||
|
@ -43,6 +42,7 @@
|
||||||
"nvim-ts-context-commentstring": { "branch": "main", "commit": "0bdccb9c67a42a5e2d99384dc9bfa29b1451528f" },
|
"nvim-ts-context-commentstring": { "branch": "main", "commit": "0bdccb9c67a42a5e2d99384dc9bfa29b1451528f" },
|
||||||
"nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" },
|
"nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" },
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" },
|
"nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" },
|
||||||
|
"onedarkpro.nvim": { "branch": "main", "commit": "ec07364f3cfa9cc6467bf067a490cfd74011efcd" },
|
||||||
"plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
|
"plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
|
||||||
"promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" },
|
"promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" },
|
||||||
"smart-splits.nvim": { "branch": "master", "commit": "2179ec0d26aacd4f40c766c79f6ebc83b7001e48" },
|
"smart-splits.nvim": { "branch": "master", "commit": "2179ec0d26aacd4f40c766c79f6ebc83b7001e48" },
|
||||||
|
|
|
@ -17,5 +17,5 @@ require("custom.keymaps")
|
||||||
-- require("user.chat_gpt")
|
-- require("user.chat_gpt")
|
||||||
-- vim.cmd("colorscheme one_monokai")
|
-- vim.cmd("colorscheme one_monokai")
|
||||||
-- vim.cmd("colorscheme onedark")
|
-- vim.cmd("colorscheme onedark")
|
||||||
vim.cmd("colorscheme github_dark_dimmed")
|
-- vim.cmd("colorscheme github_dark_dimmed")
|
||||||
-- vim.cmd("colorscheme github_dark_high_contrast")
|
-- vim.cmd("colorscheme github_dark_high_contrast")
|
||||||
|
|
|
@ -1,109 +1,110 @@
|
||||||
return {
|
return {
|
||||||
{
|
-- {
|
||||||
"navarasu/onedark.nvim",
|
-- "navarasu/onedark.nvim",
|
||||||
enabled = false,
|
-- enabled = false,
|
||||||
},
|
-- },
|
||||||
{
|
-- {
|
||||||
"projekt0n/github-nvim-theme",
|
-- "projekt0n/github-nvim-theme",
|
||||||
lazy = false, -- make sure we load this during startup if it is your main colorscheme
|
-- lazy = false, -- make sure we load this during startup if it is your main colorscheme
|
||||||
priority = 1000, -- make sure to load this before all the other start plugins
|
-- priority = 1000, -- make sure to load this before all the other start plugins
|
||||||
config = function()
|
-- config = function()
|
||||||
local is_transparent = false
|
-- local is_transparent = false
|
||||||
local palette = require("github-theme.palette").load("github_dark_dimmed")
|
-- local palette = require("github-theme.palette").load("github_dark_dimmed")
|
||||||
require("github-theme").setup({
|
-- require("github-theme").setup({
|
||||||
options = {
|
-- options = {
|
||||||
-- Compiled file's destination location
|
-- -- Compiled file's destination location
|
||||||
compile_path = vim.fn.stdpath("cache") .. "/github-theme",
|
-- compile_path = vim.fn.stdpath("cache") .. "/github-theme",
|
||||||
compile_file_suffix = "_compiled", -- Compiled file suffix
|
-- compile_file_suffix = "_compiled", -- Compiled file suffix
|
||||||
hide_end_of_buffer = true, -- Hide the '~' character at the end of the buffer for a cleaner look
|
-- hide_end_of_buffer = true, -- Hide the '~' character at the end of the buffer for a cleaner look
|
||||||
hide_nc_statusline = true, -- Override the underline style for non-active statuslines
|
-- hide_nc_statusline = true, -- Override the underline style for non-active statuslines
|
||||||
transparent = is_transparent, -- Disable setting background
|
-- transparent = is_transparent, -- Disable setting background
|
||||||
terminal_colors = true, -- Set terminal colors (vim.g.terminal_color_*) used in `:terminal`
|
-- terminal_colors = true, -- Set terminal colors (vim.g.terminal_color_*) used in `:terminal`
|
||||||
dim_inactive = false, -- Non focused panes set to alternative background
|
-- dim_inactive = false, -- Non focused panes set to alternative background
|
||||||
module_default = true, -- Default enable value for modules
|
-- module_default = true, -- Default enable value for modules
|
||||||
styles = { -- Style to be applied to different syntax groups
|
-- styles = { -- Style to be applied to different syntax groups
|
||||||
comments = "italic", -- Value is any valid attr-list value `:help attr-list`
|
-- comments = "italic", -- Value is any valid attr-list value `:help attr-list`
|
||||||
functions = "italic",
|
-- functions = "italic",
|
||||||
keywords = "NONE",
|
-- keywords = "NONE",
|
||||||
variables = "NONE",
|
-- variables = "NONE",
|
||||||
conditionals = "NONE",
|
-- conditionals = "NONE",
|
||||||
constants = "NONE",
|
-- constants = "NONE",
|
||||||
numbers = "NONE",
|
-- numbers = "NONE",
|
||||||
operators = "NONE",
|
-- operators = "NONE",
|
||||||
strings = "NONE",
|
-- strings = "NONE",
|
||||||
types = "NONE",
|
-- types = "NONE",
|
||||||
},
|
-- },
|
||||||
inverse = { -- Inverse highlight for different types
|
-- inverse = { -- Inverse highlight for different types
|
||||||
match_paren = false,
|
-- match_paren = false,
|
||||||
visual = false,
|
-- visual = false,
|
||||||
search = false,
|
-- search = false,
|
||||||
},
|
-- },
|
||||||
darken = { -- Darken floating windows and sidebar-like windows
|
-- darken = { -- Darken floating windows and sidebar-like windows
|
||||||
floats = false,
|
-- floats = false,
|
||||||
sidebars = {
|
-- sidebars = {
|
||||||
enabled = true,
|
-- enabled = true,
|
||||||
list = {}, -- Apply dark background to specific windows
|
-- list = {}, -- Apply dark background to specific windows
|
||||||
},
|
-- },
|
||||||
},
|
-- },
|
||||||
modules = { -- List of various plugins and additional options
|
-- modules = { -- List of various plugins and additional options
|
||||||
-- ...
|
-- -- ...
|
||||||
},
|
-- },
|
||||||
},
|
-- },
|
||||||
palettes = {
|
-- palettes = {
|
||||||
github_dark_dimmed = {
|
-- github_dark_dimmed = {
|
||||||
bg0 = is_transparent and "NONE" or "bg1",
|
-- bg0 = is_transparent and "NONE" or "bg1",
|
||||||
bg1 = is_transparent and "NONE" or "bg",
|
-- bg1 = is_transparent and "NONE" or "bg",
|
||||||
},
|
-- },
|
||||||
},
|
-- },
|
||||||
specs = {},
|
-- specs = {},
|
||||||
groups = {
|
-- groups = {
|
||||||
all = {
|
-- all = {
|
||||||
illuminatedWord = { bg = "#3b4261" },
|
-- illuminatedWord = { bg = "#3b4261" },
|
||||||
illuminatedCurWord = { bg = "#3b4261" },
|
-- illuminatedCurWord = { bg = "#3b4261" },
|
||||||
IlluminatedWordText = { bg = "#3b4261" },
|
-- IlluminatedWordText = { bg = "#3b4261" },
|
||||||
IlluminatedWordRead = { bg = "#3b4261" },
|
-- IlluminatedWordRead = { bg = "#3b4261" },
|
||||||
IlluminatedWordWrite = { bg = "#3b4261" },
|
-- IlluminatedWordWrite = { bg = "#3b4261" },
|
||||||
["@tag.attribute"] = { fg = "#77bdfb", style = "italic" },
|
-- ["@tag.attribute"] = { fg = "#77bdfb", style = "italic" },
|
||||||
["@text.uri"] = { fg = palette.const, style = "italic" },
|
-- ["@text.uri"] = { fg = palette.const, style = "italic" },
|
||||||
["@keyword.return"] = { fg = "#fa7970", style = "italic" },
|
-- ["@keyword.return"] = { fg = "#fa7970", style = "italic" },
|
||||||
-- ["@tag.attribute.html"] = { fg = "#faa356", style = "italic" },
|
-- -- ["@tag.attribute.html"] = { fg = "#faa356", style = "italic" },
|
||||||
-- ["@operator.html"] = { fg = "#faa356" },
|
-- -- ["@operator.html"] = { fg = "#faa356" },
|
||||||
-- ["@tag.html"] = { fg = "#fa7970" },
|
-- -- ["@tag.html"] = { fg = "#fa7970" },
|
||||||
-- ["@tag.delimiter.html"] = { fg = "#faa356" },
|
-- -- ["@tag.delimiter.html"] = { fg = "#faa356" },
|
||||||
["@tag.javascript"] = { fg = "#faa356" },
|
-- -- ["@tag.javascript"] = { fg = "#faa356" },
|
||||||
-- ["@tag.javascript"] = { fg = "#8ddb8c" },
|
-- -- ["@tag.javascript"] = { fg = "#8ddb8c" },
|
||||||
-- ["@tag.tsx"] = { fg = "#8ddb8c" },
|
-- -- ["@tag.tsx"] = { fg = "#8ddb8c" },
|
||||||
["@tag.delimiter.javascript"] = { fg = "fg1" },
|
-- ["@string.special.url"] = { fg = palette.const, style = "italic" },
|
||||||
["@tag.tsx"] = { fg = "#faa356" },
|
-- ["@tag.delimiter.javascript"] = { fg = "fg1" },
|
||||||
["@lsp.type.parameter"] = { fg = "#faa356" },
|
-- ["@tag.tsx"] = { fg = "#faa356" },
|
||||||
["@property.lua"] = { fg = "#91cbff", bg = is_transparent and "NONE" or "bg1" },
|
-- ["@lsp.type.parameter"] = { fg = "#faa356" },
|
||||||
["@lsp.type.property.lua"] = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" },
|
-- ["@property.lua"] = { fg = "#91cbff", bg = is_transparent and "NONE" or "bg1" },
|
||||||
["@lsp.type.variable.lua"] = { fg = "#91cbff", bg = is_transparent and "NONE" or "bg1" },
|
-- ["@lsp.type.property.lua"] = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" },
|
||||||
},
|
-- ["@lsp.type.variable.lua"] = { fg = "#91cbff", bg = is_transparent and "NONE" or "bg1" },
|
||||||
github_dark_high_contrast = {
|
-- },
|
||||||
NvimTreeSpecialFile = { fg = "#faa356", style = "italic" },
|
-- github_dark_high_contrast = {
|
||||||
},
|
-- NvimTreeSpecialFile = { fg = "#faa356", style = "italic" },
|
||||||
github_dark_dimmed = {
|
-- },
|
||||||
-- As with specs and palettes, a specific style's value will be used over the `all`'s value.
|
-- github_dark_dimmed = {
|
||||||
NvimTreeNormal = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" },
|
-- -- As with specs and palettes, a specific style's value will be used over the `all`'s value.
|
||||||
NvimTreeSpecialFile = { fg = "#faa356", style = "italic" },
|
-- NvimTreeNormal = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" },
|
||||||
NvimTreeIndentMarker = { fg = "#3E4450" },
|
-- NvimTreeSpecialFile = { fg = "#faa356", style = "italic" },
|
||||||
BufferLineFill = { bg = is_transparent and "NONE" or "bg1" },
|
-- NvimTreeIndentMarker = { fg = "#3E4450" },
|
||||||
BufferLineUnfocusedFill = { bg = is_transparent and "NONE" or "bg1" },
|
-- BufferLineFill = { bg = is_transparent and "NONE" or "bg1" },
|
||||||
LualineNormal = { bg = is_transparent and "NONE" or "bg1" },
|
-- BufferLineUnfocusedFill = { bg = is_transparent and "NONE" or "bg1" },
|
||||||
StatusLine = { bg = is_transparent and "NONE" or "bg1" },
|
-- LualineNormal = { bg = is_transparent and "NONE" or "bg1" },
|
||||||
StatusLineTerm = { bg = is_transparent and "NONE" or "bg1" },
|
-- StatusLine = { bg = is_transparent and "NONE" or "bg1" },
|
||||||
Pmenu = { bg = is_transparent and "NONE" or "bg1" },
|
-- StatusLineTerm = { bg = is_transparent and "NONE" or "bg1" },
|
||||||
PmenuSel = { link = "CursorLine" },
|
-- Pmenu = { bg = is_transparent and "NONE" or "bg1" },
|
||||||
WhichKeyFloat = { bg = is_transparent and "NONE" or "bg1" },
|
-- PmenuSel = { link = "CursorLine" },
|
||||||
LazyNormal = { bg = is_transparent and "NONE" or "bg1" },
|
-- WhichKeyFloat = { bg = is_transparent and "NONE" or "bg1" },
|
||||||
LazyBackground = { bg = is_transparent and "NONE" or "bg1" },
|
-- LazyNormal = { bg = is_transparent and "NONE" or "bg1" },
|
||||||
NormalSB = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" }, -- normal text
|
-- LazyBackground = { bg = is_transparent and "NONE" or "bg1" },
|
||||||
NormalFloat = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" },
|
-- NormalSB = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" }, -- normal text
|
||||||
IblIndent = { fg = "#3E4450" },
|
-- NormalFloat = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" },
|
||||||
},
|
-- IblIndent = { fg = "#3E4450" },
|
||||||
},
|
-- },
|
||||||
})
|
-- },
|
||||||
end,
|
-- })
|
||||||
},
|
-- end,
|
||||||
|
-- },
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,243 +1,243 @@
|
||||||
return {
|
return {
|
||||||
{
|
-- {
|
||||||
"nvim-lualine/lualine.nvim",
|
-- "nvim-lualine/lualine.nvim",
|
||||||
event = "InsertEnter",
|
-- event = "InsertEnter",
|
||||||
config = function()
|
-- config = function()
|
||||||
local hide_in_width = function()
|
-- local hide_in_width = function()
|
||||||
return vim.fn.winwidth(0) > 80
|
-- return vim.fn.winwidth(0) > 80
|
||||||
end
|
-- end
|
||||||
local icons = require("user.icons")
|
-- local icons = require("user.icons")
|
||||||
|
--
|
||||||
local getLeftSubstring = function(word, length)
|
-- local getLeftSubstring = function(word, length)
|
||||||
if #word > length then
|
-- if #word > length then
|
||||||
return string.sub(word, 1, length) .. "..."
|
-- return string.sub(word, 1, length) .. "..."
|
||||||
else
|
-- else
|
||||||
return word
|
-- return word
|
||||||
end
|
-- end
|
||||||
end
|
-- end
|
||||||
|
--
|
||||||
-- start for lsp
|
-- -- start for lsp
|
||||||
local list_registered_providers_names = function(filetype)
|
-- local list_registered_providers_names = function(filetype)
|
||||||
local s = require("null-ls.sources")
|
-- local s = require("null-ls.sources")
|
||||||
local available_sources = s.get_available(filetype)
|
-- local available_sources = s.get_available(filetype)
|
||||||
local registered = {}
|
-- local registered = {}
|
||||||
for _, source in ipairs(available_sources) do
|
-- for _, source in ipairs(available_sources) do
|
||||||
for method in pairs(source.methods) do
|
-- for method in pairs(source.methods) do
|
||||||
registered[method] = registered[method] or {}
|
-- registered[method] = registered[method] or {}
|
||||||
table.insert(registered[method], source.name)
|
-- table.insert(registered[method], source.name)
|
||||||
end
|
-- end
|
||||||
end
|
-- end
|
||||||
return registered
|
-- return registered
|
||||||
end
|
-- end
|
||||||
|
--
|
||||||
local null_ls = require("null-ls")
|
-- local null_ls = require("null-ls")
|
||||||
-- for formatter
|
-- -- for formatter
|
||||||
local list_registered = function(filetype)
|
-- local list_registered = function(filetype)
|
||||||
local method = null_ls.methods.FORMATTING
|
-- local method = null_ls.methods.FORMATTING
|
||||||
local registered_providers = list_registered_providers_names(filetype)
|
-- local registered_providers = list_registered_providers_names(filetype)
|
||||||
return registered_providers[method] or {}
|
-- return registered_providers[method] or {}
|
||||||
end
|
-- end
|
||||||
|
--
|
||||||
--- for linter
|
-- --- for linter
|
||||||
local alternative_methods = {
|
-- local alternative_methods = {
|
||||||
null_ls.methods.DIAGNOSTICS,
|
-- null_ls.methods.DIAGNOSTICS,
|
||||||
null_ls.methods.DIAGNOSTICS_ON_OPEN,
|
-- null_ls.methods.DIAGNOSTICS_ON_OPEN,
|
||||||
null_ls.methods.DIAGNOSTICS_ON_SAVE,
|
-- null_ls.methods.DIAGNOSTICS_ON_SAVE,
|
||||||
}
|
-- }
|
||||||
|
--
|
||||||
local linter_list_registered = function(filetype)
|
-- local linter_list_registered = function(filetype)
|
||||||
local registered_providers = list_registered_providers_names(filetype)
|
-- local registered_providers = list_registered_providers_names(filetype)
|
||||||
-- local providers_for_methods = vim.tbl_flatten(vim.tbl_map(function(m)
|
-- -- local providers_for_methods = vim.tbl_flatten(vim.tbl_map(function(m)
|
||||||
-- return registered_providers[m] or {}
|
-- -- return registered_providers[m] or {}
|
||||||
-- end, alternative_methods))
|
-- -- end, alternative_methods))
|
||||||
local providers_for_methods = vim.iter(vim.tbl_map(function(m)
|
-- local providers_for_methods = vim.iter(vim.tbl_map(function(m)
|
||||||
return registered_providers[m] or {}
|
-- return registered_providers[m] or {}
|
||||||
end, alternative_methods))
|
-- end, alternative_methods))
|
||||||
|
--
|
||||||
return providers_for_methods
|
-- return providers_for_methods
|
||||||
end
|
-- end
|
||||||
-- end for lsp
|
-- -- end for lsp
|
||||||
|
--
|
||||||
local lsp_info = {
|
-- local lsp_info = {
|
||||||
function()
|
-- function()
|
||||||
local msg = "LS Inactive"
|
-- local msg = "LS Inactive"
|
||||||
local buf_ft = vim.bo.filetype
|
-- local buf_ft = vim.bo.filetype
|
||||||
-- start register
|
-- -- start register
|
||||||
local buf_clients = vim.lsp.get_clients()
|
-- local buf_clients = vim.lsp.get_clients()
|
||||||
local buf_client_names = {}
|
-- local buf_client_names = {}
|
||||||
if next(buf_clients) == nil then
|
-- if next(buf_clients) == nil then
|
||||||
-- TODO: clean up this if statement
|
-- -- TODO: clean up this if statement
|
||||||
if type(msg) == "boolean" or #msg == 0 then
|
-- if type(msg) == "boolean" or #msg == 0 then
|
||||||
return "LS Inactive"
|
-- return "LS Inactive"
|
||||||
end
|
-- end
|
||||||
return msg
|
-- return msg
|
||||||
end
|
-- end
|
||||||
-- add client
|
-- -- add client
|
||||||
for _, client in pairs(buf_clients) do
|
-- for _, client in pairs(buf_clients) do
|
||||||
if client.name ~= "null-ls" and client.name ~= "copilot" then
|
-- if client.name ~= "null-ls" and client.name ~= "copilot" then
|
||||||
table.insert(buf_client_names, client.name)
|
-- table.insert(buf_client_names, client.name)
|
||||||
end
|
-- end
|
||||||
end
|
-- end
|
||||||
-- add formatter
|
-- -- add formatter
|
||||||
local supported_formatters = list_registered(buf_ft)
|
-- local supported_formatters = list_registered(buf_ft)
|
||||||
vim.list_extend(buf_client_names, supported_formatters)
|
-- vim.list_extend(buf_client_names, supported_formatters)
|
||||||
-- add linter
|
-- -- add linter
|
||||||
local supported_linters = linter_list_registered(buf_ft)
|
-- local supported_linters = linter_list_registered(buf_ft)
|
||||||
vim.list_extend(buf_client_names, supported_linters)
|
-- vim.list_extend(buf_client_names, supported_linters)
|
||||||
-- decomple
|
-- -- decomple
|
||||||
local unique_client_names = vim.fn.uniq(buf_client_names)
|
-- local unique_client_names = vim.fn.uniq(buf_client_names)
|
||||||
local msg = table.concat(unique_client_names, ", ")
|
-- local msg = table.concat(unique_client_names, ", ")
|
||||||
return msg
|
-- return msg
|
||||||
end,
|
-- end,
|
||||||
--icon = " ",
|
-- --icon = " ",
|
||||||
icon = icons.ui.Gear .. "",
|
-- icon = icons.ui.Gear .. "",
|
||||||
padding = 1,
|
-- padding = 1,
|
||||||
}
|
-- }
|
||||||
|
--
|
||||||
local diagnostics = {
|
-- local diagnostics = {
|
||||||
"diagnostics",
|
-- "diagnostics",
|
||||||
sources = { "nvim_diagnostic" },
|
-- sources = { "nvim_diagnostic" },
|
||||||
sections = { "error", "warn" },
|
-- sections = { "error", "warn" },
|
||||||
-- symbols = { error = " ", warn = " " },
|
-- -- symbols = { error = " ", warn = " " },
|
||||||
symbols = {
|
-- symbols = {
|
||||||
error = icons.diagnostics.BoldError .. " ",
|
-- error = icons.diagnostics.BoldError .. " ",
|
||||||
warn = icons.diagnostics.BoldWarning .. " ",
|
-- warn = icons.diagnostics.BoldWarning .. " ",
|
||||||
},
|
-- },
|
||||||
colored = true,
|
-- colored = true,
|
||||||
update_in_insert = false,
|
-- update_in_insert = false,
|
||||||
always_visible = false,
|
-- always_visible = false,
|
||||||
}
|
-- }
|
||||||
|
--
|
||||||
local diff = {
|
-- local diff = {
|
||||||
"diff",
|
-- "diff",
|
||||||
colored = true,
|
-- colored = true,
|
||||||
-- symbols = { added = " ", modified = " ", removed = " " }, -- changes diff symbols
|
-- -- symbols = { added = " ", modified = " ", removed = " " }, -- changes diff symbols
|
||||||
symbols = {
|
-- symbols = {
|
||||||
added = icons.git.LineAdded .. " ",
|
-- added = icons.git.LineAdded .. " ",
|
||||||
modified = icons.git.LineModified .. " ",
|
-- modified = icons.git.LineModified .. " ",
|
||||||
removed = icons.git.LineRemoved .. " ",
|
-- removed = icons.git.LineRemoved .. " ",
|
||||||
}, -- changes diff symbols
|
-- }, -- changes diff symbols
|
||||||
cond = hide_in_width,
|
-- cond = hide_in_width,
|
||||||
}
|
-- }
|
||||||
|
--
|
||||||
local spaces = function()
|
-- local spaces = function()
|
||||||
-- return " " .. vim.api.nvim_buf_get_option(0, "shiftwidth")
|
-- -- return " " .. vim.api.nvim_buf_get_option(0, "shiftwidth")
|
||||||
return icons.ui.Tab .. " " .. vim.api.nvim_get_option_value(0, "shiftwidth")
|
-- return icons.ui.Tab .. " " .. vim.api.nvim_get_option_value(0, "shiftwidth")
|
||||||
end
|
-- end
|
||||||
|
--
|
||||||
local mode = {
|
-- local mode = {
|
||||||
"mode",
|
-- "mode",
|
||||||
padding = 1,
|
-- padding = 1,
|
||||||
separator = { left = " " },
|
-- separator = { left = " " },
|
||||||
-- right_padding = 3,
|
-- -- right_padding = 3,
|
||||||
fmt = function(str)
|
-- fmt = function(str)
|
||||||
return icons.ui.Neovim .. " " .. str
|
-- return icons.ui.Neovim .. " " .. str
|
||||||
end,
|
-- end,
|
||||||
}
|
-- }
|
||||||
local branch = {
|
-- local branch = {
|
||||||
"branch",
|
-- "branch",
|
||||||
padding = 1,
|
-- padding = 1,
|
||||||
}
|
-- }
|
||||||
|
--
|
||||||
local get_branch = function()
|
-- local get_branch = function()
|
||||||
if vim.b.gitsigns_head ~= nil then
|
-- if vim.b.gitsigns_head ~= nil then
|
||||||
return icons.git.Branch2 .. " " .. getLeftSubstring(vim.b.gitsigns_head, 6)
|
-- return icons.git.Branch2 .. " " .. getLeftSubstring(vim.b.gitsigns_head, 6)
|
||||||
else
|
-- else
|
||||||
return icons.git.Branch2 .. vim.fn.fnamemodify("", ":t")
|
-- return icons.git.Branch2 .. vim.fn.fnamemodify("", ":t")
|
||||||
end
|
-- end
|
||||||
end
|
-- end
|
||||||
|
--
|
||||||
local lsp_progress = {}
|
-- local lsp_progress = {}
|
||||||
local data_ok, lspprogress = pcall(require, "lsp-progress")
|
-- local data_ok, lspprogress = pcall(require, "lsp-progress")
|
||||||
if data_ok then
|
-- if data_ok then
|
||||||
lsp_progress = lspprogress.progress
|
-- lsp_progress = lspprogress.progress
|
||||||
end
|
-- end
|
||||||
-- stylua: ignore
|
-- -- stylua: ignore
|
||||||
-- local github=vim.fn.fnamemodify("auto", ":t")
|
-- -- local github=vim.fn.fnamemodify("auto", ":t")
|
||||||
local github={}
|
-- local github={}
|
||||||
local status_ok, _ = pcall(require, "github-theme")
|
-- local status_ok, _ = pcall(require, "github-theme")
|
||||||
if status_ok then
|
-- if status_ok then
|
||||||
local C = require("github-theme.lib.color")
|
-- local C = require("github-theme.lib.color")
|
||||||
local config = require("github-theme.config").options
|
-- local config = require("github-theme.config").options
|
||||||
local s = require("github-theme.spec").load("github_dark_dimmed")
|
-- local s = require("github-theme.spec").load("github_dark_dimmed")
|
||||||
local p = s.palette
|
-- local p = s.palette
|
||||||
local tbg = config.transparent and "NONE" or s.bg0
|
-- local tbg = config.transparent and "NONE" or s.bg0
|
||||||
|
--
|
||||||
local function blend(color, a)
|
-- local function blend(color, a)
|
||||||
return C(s.bg1):blend(C(color), a):to_css()
|
-- return C(s.bg1):blend(C(color), a):to_css()
|
||||||
end
|
-- end
|
||||||
|
--
|
||||||
--- Create lualine group colors for github-theme
|
-- --- Create lualine group colors for github-theme
|
||||||
---@param color string
|
-- ---@param color string
|
||||||
local tint = function(color)
|
-- local tint = function(color)
|
||||||
return {
|
-- return {
|
||||||
a = { bg = color, fg = s.bg1 },
|
-- a = { bg = color, fg = s.bg1 },
|
||||||
b = { bg = blend(color, 0.2), fg = blend(color, 0.8) },
|
-- b = { bg = blend(color, 0.2), fg = blend(color, 0.8) },
|
||||||
c = { bg = "NONE", fg = blend(color, 0.60) },
|
-- c = { bg = "NONE", fg = blend(color, 0.60) },
|
||||||
}
|
-- }
|
||||||
end
|
-- end
|
||||||
|
--
|
||||||
local inactive_hi = { bg = tbg, fg = blend(s.fg1, 0.3) }
|
-- local inactive_hi = { bg = tbg, fg = blend(s.fg1, 0.3) }
|
||||||
github = {
|
-- github = {
|
||||||
normal = tint(p.blue.base),
|
-- normal = tint(p.blue.base),
|
||||||
insert = tint(p.green.base),
|
-- insert = tint(p.green.base),
|
||||||
command = tint(p.magenta.bright),
|
-- command = tint(p.magenta.bright),
|
||||||
visual = tint(p.yellow.base),
|
-- visual = tint(p.yellow.base),
|
||||||
replace = tint(p.red.base),
|
-- replace = tint(p.red.base),
|
||||||
terminal = tint(p.orange),
|
-- terminal = tint(p.orange),
|
||||||
inactive = {
|
-- inactive = {
|
||||||
a = inactive_hi,
|
-- a = inactive_hi,
|
||||||
b = inactive_hi,
|
-- b = inactive_hi,
|
||||||
c = inactive_hi,
|
-- c = inactive_hi,
|
||||||
},
|
-- },
|
||||||
}
|
-- }
|
||||||
end
|
-- end
|
||||||
|
--
|
||||||
require("lualine").setup({
|
-- require("lualine").setup({
|
||||||
options = {
|
-- options = {
|
||||||
theme = github or "auto",
|
-- theme = github or "auto",
|
||||||
-- theme = "auto",
|
-- -- theme = "auto",
|
||||||
component_separators = { left = "", right = "" },
|
-- component_separators = { left = "", right = "" },
|
||||||
section_separators = { left = "", right = "" },
|
-- section_separators = { left = "", right = "" },
|
||||||
disabled_filetypes = {
|
-- disabled_filetypes = {
|
||||||
"TelescopePrompt",
|
-- "TelescopePrompt",
|
||||||
"packer",
|
-- "packer",
|
||||||
"alpha",
|
-- "alpha",
|
||||||
"dashboard",
|
-- "dashboard",
|
||||||
"NvimTree",
|
-- "NvimTree",
|
||||||
"Outline",
|
-- "Outline",
|
||||||
"DressingInput",
|
-- "DressingInput",
|
||||||
"toggleterm",
|
-- "toggleterm",
|
||||||
"lazy",
|
-- "lazy",
|
||||||
"mason",
|
-- "mason",
|
||||||
"neo-tree",
|
-- "neo-tree",
|
||||||
"startuptime",
|
-- "startuptime",
|
||||||
},
|
-- },
|
||||||
always_divide_middle = true,
|
-- always_divide_middle = true,
|
||||||
},
|
-- },
|
||||||
sections = {
|
-- sections = {
|
||||||
lualine_a = {
|
-- lualine_a = {
|
||||||
mode,
|
-- mode,
|
||||||
},
|
-- },
|
||||||
lualine_b = { get_branch },
|
-- lualine_b = { get_branch },
|
||||||
lualine_c = { lsp_info, diagnostics, lsp_progress },
|
-- lualine_c = { lsp_info, diagnostics, lsp_progress },
|
||||||
lualine_x = { diff, spaces, "filetype" },
|
-- lualine_x = { diff, spaces, "filetype" },
|
||||||
lualine_y = { "progress" },
|
-- lualine_y = { "progress" },
|
||||||
lualine_z = {
|
-- lualine_z = {
|
||||||
{ "location", separator = { right = " " }, padding = 1 },
|
-- { "location", separator = { right = " " }, padding = 1 },
|
||||||
},
|
-- },
|
||||||
},
|
-- },
|
||||||
inactive_sections = {
|
-- inactive_sections = {
|
||||||
lualine_a = { "filename" },
|
-- lualine_a = { "filename" },
|
||||||
lualine_b = {},
|
-- lualine_b = {},
|
||||||
lualine_c = {},
|
-- lualine_c = {},
|
||||||
lualine_x = {},
|
-- lualine_x = {},
|
||||||
lualine_y = {},
|
-- lualine_y = {},
|
||||||
lualine_z = { "location" },
|
-- lualine_z = { "location" },
|
||||||
},
|
-- },
|
||||||
tabline = {},
|
-- tabline = {},
|
||||||
extensions = {},
|
-- extensions = {},
|
||||||
})
|
-- })
|
||||||
end,
|
-- end,
|
||||||
},
|
-- },
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,248 +1,248 @@
|
||||||
return {
|
return {
|
||||||
-- {
|
{
|
||||||
-- "nvim-lualine/lualine.nvim",
|
"nvim-lualine/lualine.nvim",
|
||||||
-- event = "InsertEnter",
|
event = "InsertEnter",
|
||||||
-- config = function()
|
config = function()
|
||||||
-- local hide_in_width = function()
|
local hide_in_width = function()
|
||||||
-- return vim.fn.winwidth(0) > 80
|
return vim.fn.winwidth(0) > 80
|
||||||
-- end
|
end
|
||||||
-- local icons = require("user.icons")
|
local icons = require("user.icons")
|
||||||
--
|
|
||||||
-- local getLeftSubstring = function(word, length)
|
local getLeftSubstring = function(word, length)
|
||||||
-- if #word > length then
|
if #word > length then
|
||||||
-- return string.sub(word, 1, length) .. "..."
|
return string.sub(word, 1, length) .. "..."
|
||||||
-- else
|
else
|
||||||
-- return word
|
return word
|
||||||
-- end
|
end
|
||||||
-- end
|
end
|
||||||
--
|
|
||||||
-- -- start for lsp
|
-- start for lsp
|
||||||
-- local list_registered_providers_names = function(filetype)
|
local list_registered_providers_names = function(filetype)
|
||||||
-- local s = require("null-ls.sources")
|
local s = require("null-ls.sources")
|
||||||
-- local available_sources = s.get_available(filetype)
|
local available_sources = s.get_available(filetype)
|
||||||
-- local registered = {}
|
local registered = {}
|
||||||
-- for _, source in ipairs(available_sources) do
|
for _, source in ipairs(available_sources) do
|
||||||
-- for method in pairs(source.methods) do
|
for method in pairs(source.methods) do
|
||||||
-- registered[method] = registered[method] or {}
|
registered[method] = registered[method] or {}
|
||||||
-- table.insert(registered[method], source.name)
|
table.insert(registered[method], source.name)
|
||||||
-- end
|
end
|
||||||
-- end
|
end
|
||||||
-- return registered
|
return registered
|
||||||
-- end
|
end
|
||||||
--
|
|
||||||
-- local null_ls = require("null-ls")
|
local null_ls = require("null-ls")
|
||||||
-- -- for formatter
|
-- for formatter
|
||||||
-- local list_registered = function(filetype)
|
local list_registered = function(filetype)
|
||||||
-- local method = null_ls.methods.FORMATTING
|
local method = null_ls.methods.FORMATTING
|
||||||
-- local registered_providers = list_registered_providers_names(filetype)
|
local registered_providers = list_registered_providers_names(filetype)
|
||||||
-- return registered_providers[method] or {}
|
return registered_providers[method] or {}
|
||||||
-- end
|
end
|
||||||
--
|
|
||||||
-- --- for linter
|
--- for linter
|
||||||
-- local alternative_methods = {
|
local alternative_methods = {
|
||||||
-- null_ls.methods.DIAGNOSTICS,
|
null_ls.methods.DIAGNOSTICS,
|
||||||
-- null_ls.methods.DIAGNOSTICS_ON_OPEN,
|
null_ls.methods.DIAGNOSTICS_ON_OPEN,
|
||||||
-- null_ls.methods.DIAGNOSTICS_ON_SAVE,
|
null_ls.methods.DIAGNOSTICS_ON_SAVE,
|
||||||
-- }
|
}
|
||||||
--
|
|
||||||
-- local linter_list_registered = function(filetype)
|
local linter_list_registered = function(filetype)
|
||||||
-- local registered_providers = list_registered_providers_names(filetype)
|
local registered_providers = list_registered_providers_names(filetype)
|
||||||
-- local providers_for_methods = vim.iter(vim.tbl_map(function(m)
|
local providers_for_methods = vim.iter(vim.tbl_map(function(m)
|
||||||
-- return registered_providers[m] or {}
|
return registered_providers[m] or {}
|
||||||
-- end, alternative_methods))
|
end, alternative_methods))
|
||||||
--
|
|
||||||
-- return providers_for_methods
|
return providers_for_methods
|
||||||
-- end
|
end
|
||||||
-- -- end for lsp
|
-- end for lsp
|
||||||
--
|
|
||||||
-- local lsp_info = {
|
local lsp_info = {
|
||||||
-- function()
|
function()
|
||||||
-- local msg = "LS Inactive"
|
local msg = "LS Inactive"
|
||||||
-- local buf_ft = vim.bo.filetype
|
local buf_ft = vim.bo.filetype
|
||||||
-- -- start register
|
-- start register
|
||||||
-- local buf_clients = vim.lsp.get_clients()
|
local buf_clients = vim.lsp.get_clients()
|
||||||
-- local buf_client_names = {}
|
local buf_client_names = {}
|
||||||
-- if next(buf_clients) == nil then
|
if next(buf_clients) == nil then
|
||||||
-- -- TODO: clean up this if statement
|
-- TODO: clean up this if statement
|
||||||
-- if type(msg) == "boolean" or #msg == 0 then
|
if type(msg) == "boolean" or #msg == 0 then
|
||||||
-- return "LS Inactive"
|
return "LS Inactive"
|
||||||
-- end
|
end
|
||||||
-- return msg
|
return msg
|
||||||
-- end
|
end
|
||||||
-- -- add client
|
-- add client
|
||||||
-- for _, client in pairs(buf_clients) do
|
for _, client in pairs(buf_clients) do
|
||||||
-- if client.name ~= "null-ls" and client.name ~= "copilot" then
|
if client.name ~= "null-ls" and client.name ~= "copilot" then
|
||||||
-- table.insert(buf_client_names, client.name)
|
table.insert(buf_client_names, client.name)
|
||||||
-- end
|
end
|
||||||
-- end
|
end
|
||||||
-- -- add formatter
|
-- add formatter
|
||||||
-- local supported_formatters = list_registered(buf_ft)
|
local supported_formatters = list_registered(buf_ft)
|
||||||
-- vim.list_extend(buf_client_names, supported_formatters)
|
vim.list_extend(buf_client_names, supported_formatters)
|
||||||
-- -- add linter
|
-- add linter
|
||||||
-- local supported_linters = linter_list_registered(buf_ft)
|
local supported_linters = linter_list_registered(buf_ft)
|
||||||
-- vim.list_extend(buf_client_names, supported_linters)
|
vim.list_extend(buf_client_names, supported_linters)
|
||||||
-- -- decomple
|
-- decomple
|
||||||
-- local unique_client_names = vim.fn.uniq(buf_client_names)
|
local unique_client_names = vim.fn.uniq(buf_client_names)
|
||||||
-- local msg = table.concat(unique_client_names, ", ")
|
local msg = table.concat(unique_client_names, ", ")
|
||||||
-- return msg
|
return msg
|
||||||
-- end,
|
end,
|
||||||
-- --icon = " ",
|
--icon = " ",
|
||||||
-- icon = icons.ui.Gear .. "",
|
icon = icons.ui.Gear .. "",
|
||||||
-- padding = 1,
|
padding = 1,
|
||||||
-- }
|
}
|
||||||
--
|
|
||||||
-- local diagnostics = {
|
local diagnostics = {
|
||||||
-- "diagnostics",
|
"diagnostics",
|
||||||
-- sources = { "nvim_diagnostic" },
|
sources = { "nvim_diagnostic" },
|
||||||
-- sections = { "error", "warn" },
|
sections = { "error", "warn" },
|
||||||
-- -- symbols = { error = " ", warn = " " },
|
-- symbols = { error = " ", warn = " " },
|
||||||
-- symbols = {
|
symbols = {
|
||||||
-- error = icons.diagnostics.BoldError .. " ",
|
error = icons.diagnostics.BoldError .. " ",
|
||||||
-- warn = icons.diagnostics.BoldWarning .. " ",
|
warn = icons.diagnostics.BoldWarning .. " ",
|
||||||
-- },
|
},
|
||||||
-- colored = true,
|
colored = true,
|
||||||
-- update_in_insert = false,
|
update_in_insert = false,
|
||||||
-- always_visible = false,
|
always_visible = false,
|
||||||
-- }
|
}
|
||||||
--
|
|
||||||
-- local diff = {
|
local diff = {
|
||||||
-- "diff",
|
"diff",
|
||||||
-- colored = true,
|
colored = true,
|
||||||
-- -- symbols = { added = " ", modified = " ", removed = " " }, -- changes diff symbols
|
-- symbols = { added = " ", modified = " ", removed = " " }, -- changes diff symbols
|
||||||
-- symbols = {
|
symbols = {
|
||||||
-- added = icons.git.LineAdded .. " ",
|
added = icons.git.LineAdded .. " ",
|
||||||
-- modified = icons.git.LineModified .. " ",
|
modified = icons.git.LineModified .. " ",
|
||||||
-- removed = icons.git.LineRemoved .. " ",
|
removed = icons.git.LineRemoved .. " ",
|
||||||
-- }, -- changes diff symbols
|
}, -- changes diff symbols
|
||||||
-- cond = hide_in_width,
|
cond = hide_in_width,
|
||||||
-- }
|
}
|
||||||
--
|
|
||||||
-- local spaces = function()
|
local spaces = function()
|
||||||
-- -- return " " .. vim.api.nvim_buf_get_option(0, "shiftwidth")
|
-- return " " .. vim.api.nvim_buf_get_option(0, "shiftwidth")
|
||||||
-- return icons.ui.Tab .. " " .. vim.api.nvim_get_option_value(0, "shiftwidth")
|
return icons.ui.Tab .. " " .. vim.api.nvim_get_option_value(0, "shiftwidth")
|
||||||
-- end
|
end
|
||||||
--
|
|
||||||
-- local mode = {
|
local mode = {
|
||||||
-- "mode",
|
"mode",
|
||||||
-- padding = 1,
|
padding = 1,
|
||||||
-- separator = { left = " " },
|
separator = { left = " " },
|
||||||
-- -- right_padding = 3,
|
-- right_padding = 3,
|
||||||
-- fmt = function(str)
|
fmt = function(str)
|
||||||
-- return icons.ui.Neovim .. " " .. str
|
return icons.ui.Neovim .. " " .. str
|
||||||
-- end,
|
end,
|
||||||
-- }
|
}
|
||||||
-- local branch = {
|
local branch = {
|
||||||
-- "branch",
|
"branch",
|
||||||
-- padding = 1,
|
padding = 1,
|
||||||
-- }
|
}
|
||||||
--
|
|
||||||
-- local get_branch = function()
|
local get_branch = function()
|
||||||
-- if vim.b.gitsigns_head ~= nil then
|
if vim.b.gitsigns_head ~= nil then
|
||||||
-- return icons.git.Branch2 .. " " .. getLeftSubstring(vim.b.gitsigns_head, 6)
|
return icons.git.Branch2 .. " " .. getLeftSubstring(vim.b.gitsigns_head, 6)
|
||||||
-- else
|
else
|
||||||
-- return icons.git.Branch2 .. vim.fn.fnamemodify("", ":t")
|
return icons.git.Branch2 .. vim.fn.fnamemodify("", ":t")
|
||||||
-- end
|
end
|
||||||
-- end
|
end
|
||||||
--
|
|
||||||
-- local lsp_progress = {}
|
local lsp_progress = {}
|
||||||
-- local data_ok, lspprogress = pcall(require, "lsp-progress")
|
local data_ok, lspprogress = pcall(require, "lsp-progress")
|
||||||
-- if data_ok then
|
if data_ok then
|
||||||
-- lsp_progress = lspprogress.progress
|
lsp_progress = lspprogress.progress
|
||||||
-- end
|
end
|
||||||
-- -- stylua: ignore
|
-- stylua: ignore
|
||||||
-- -- local onedark=vim.fn.fnamemodify("auto", ":t")
|
-- local onedark=vim.fn.fnamemodify("auto", ":t")
|
||||||
-- local onedark={}
|
local onedark={}
|
||||||
-- local is_transparat = true
|
local is_transparat = true
|
||||||
-- local status_ok, onedarkpro = pcall(require, "onedarkpro.helpers")
|
local status_ok, onedarkpro = pcall(require, "onedarkpro.helpers")
|
||||||
-- if status_ok then
|
if status_ok then
|
||||||
-- local colors = onedarkpro.get_colors("onedark")
|
local colors = onedarkpro.get_colors("onedark")
|
||||||
--
|
|
||||||
-- onedark = {
|
onedark = {
|
||||||
-- normal = {
|
normal = {
|
||||||
-- a = { bg = colors.green, fg = colors.bg },
|
a = { bg = colors.green, fg = colors.bg },
|
||||||
-- b = { bg = colors.fg_gutter, fg = colors.green },
|
b = { bg = colors.fg_gutter, fg = colors.green },
|
||||||
-- c = {
|
c = {
|
||||||
-- bg = is_transparat and colors.none or colors.bg_statusline,
|
bg = is_transparat and colors.none or colors.bg_statusline,
|
||||||
-- fg = colors.fg,
|
fg = colors.fg,
|
||||||
-- },
|
},
|
||||||
-- },
|
},
|
||||||
--
|
|
||||||
-- insert = {
|
insert = {
|
||||||
-- a = { bg = colors.blue, fg = colors.bg },
|
a = { bg = colors.blue, fg = colors.bg },
|
||||||
-- b = { bg = colors.fg_gutter, fg = colors.blue },
|
b = { bg = colors.fg_gutter, fg = colors.blue },
|
||||||
-- },
|
},
|
||||||
-- visual = {
|
visual = {
|
||||||
-- a = { bg = colors.yellow, fg = colors.bg },
|
a = { bg = colors.yellow, fg = colors.bg },
|
||||||
-- b = { bg = colors.fg_gutter, fg = colors.yellow },
|
b = { bg = colors.fg_gutter, fg = colors.yellow },
|
||||||
-- },
|
},
|
||||||
-- replace = {
|
replace = {
|
||||||
-- a = { bg = colors.red, fg = colors.bg },
|
a = { bg = colors.red, fg = colors.bg },
|
||||||
-- b = { bg = colors.fg_gutter, fg = colors.red },
|
b = { bg = colors.fg_gutter, fg = colors.red },
|
||||||
-- },
|
},
|
||||||
-- command = {
|
command = {
|
||||||
-- a = { bg = colors.purple, fg = colors.bg },
|
a = { bg = colors.purple, fg = colors.bg },
|
||||||
-- b = { bg = colors.fg_gutter, fg = colors.purple },
|
b = { bg = colors.fg_gutter, fg = colors.purple },
|
||||||
-- },
|
},
|
||||||
-- terminal = {
|
terminal = {
|
||||||
-- a = { bg = colors.cyan, fg = colors.bg },
|
a = { bg = colors.cyan, fg = colors.bg },
|
||||||
-- b = { bg = colors.fg_gutter, fg = colors.cyan },
|
b = { bg = colors.fg_gutter, fg = colors.cyan },
|
||||||
-- },
|
},
|
||||||
-- inactive = {
|
inactive = {
|
||||||
-- a = { bg = colors.bg, fg = colors.blue },
|
a = { bg = colors.bg, fg = colors.blue },
|
||||||
-- b = { bg = colors.bg, fg = colors.fg_gutter_inactive, gui = "bold" },
|
b = { bg = colors.bg, fg = colors.fg_gutter_inactive, gui = "bold" },
|
||||||
-- c = {
|
c = {
|
||||||
-- bg = is_transparat and colors.none or colors.bg,
|
bg = is_transparat and colors.none or colors.bg,
|
||||||
-- fg = colors.fg_gutter_inactive,
|
fg = colors.fg_gutter_inactive,
|
||||||
-- },
|
},
|
||||||
-- },
|
},
|
||||||
-- }
|
}
|
||||||
-- end
|
end
|
||||||
--
|
|
||||||
-- require("lualine").setup({
|
require("lualine").setup({
|
||||||
-- options = {
|
options = {
|
||||||
-- theme = onedark,
|
theme = onedark,
|
||||||
-- -- theme = "auto",
|
-- theme = "auto",
|
||||||
-- component_separators = { left = "", right = "" },
|
component_separators = { left = "", right = "" },
|
||||||
-- section_separators = { left = "", right = "" },
|
section_separators = { left = "", right = "" },
|
||||||
-- disabled_filetypes = {
|
disabled_filetypes = {
|
||||||
-- "TelescopePrompt",
|
"TelescopePrompt",
|
||||||
-- "packer",
|
"packer",
|
||||||
-- "alpha",
|
"alpha",
|
||||||
-- "dashboard",
|
"dashboard",
|
||||||
-- "NvimTree",
|
"NvimTree",
|
||||||
-- "Outline",
|
"Outline",
|
||||||
-- "DressingInput",
|
"DressingInput",
|
||||||
-- "toggleterm",
|
"toggleterm",
|
||||||
-- "lazy",
|
"lazy",
|
||||||
-- "mason",
|
"mason",
|
||||||
-- "neo-tree",
|
"neo-tree",
|
||||||
-- "startuptime",
|
"startuptime",
|
||||||
-- },
|
},
|
||||||
-- always_divide_middle = true,
|
always_divide_middle = true,
|
||||||
-- },
|
},
|
||||||
-- sections = {
|
sections = {
|
||||||
-- lualine_a = {
|
lualine_a = {
|
||||||
-- mode,
|
mode,
|
||||||
-- },
|
},
|
||||||
-- lualine_b = { get_branch },
|
lualine_b = { get_branch },
|
||||||
-- lualine_c = { lsp_info, diagnostics, lsp_progress },
|
lualine_c = { lsp_info, diagnostics, lsp_progress },
|
||||||
-- lualine_x = { diff, spaces, "filetype" },
|
lualine_x = { diff, spaces, "filetype" },
|
||||||
-- lualine_y = { "progress" },
|
lualine_y = { "progress" },
|
||||||
-- lualine_z = {
|
lualine_z = {
|
||||||
-- { "location", separator = { right = " " }, padding = 1 },
|
{ "location", separator = { right = " " }, padding = 1 },
|
||||||
-- },
|
},
|
||||||
-- },
|
},
|
||||||
-- inactive_sections = {
|
inactive_sections = {
|
||||||
-- lualine_a = { "filename" },
|
lualine_a = { "filename" },
|
||||||
-- lualine_b = {},
|
lualine_b = {},
|
||||||
-- lualine_c = {},
|
lualine_c = {},
|
||||||
-- lualine_x = {},
|
lualine_x = {},
|
||||||
-- lualine_y = {},
|
lualine_y = {},
|
||||||
-- lualine_z = { "location" },
|
lualine_z = { "location" },
|
||||||
-- },
|
},
|
||||||
-- tabline = {},
|
tabline = {},
|
||||||
-- extensions = {},
|
extensions = {},
|
||||||
-- })
|
})
|
||||||
-- end,
|
end,
|
||||||
-- },
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,110 +1,114 @@
|
||||||
return {
|
return {
|
||||||
-- { "navarasu/onedark.nvim", enabled = false },
|
{ "navarasu/onedark.nvim", enabled = false },
|
||||||
-- {
|
{
|
||||||
-- "olimorris/onedarkpro.nvim",
|
"olimorris/onedarkpro.nvim",
|
||||||
-- priority = 1000, -- Ensure it loads first
|
priority = 1000, -- Ensure it loads first
|
||||||
-- config = function()
|
config = function()
|
||||||
-- local is_transparent = false
|
local is_transparent = false
|
||||||
-- require("onedarkpro").setup({
|
require("onedarkpro").setup({
|
||||||
-- styles = {
|
styles = {
|
||||||
-- types = "NONE",
|
types = "NONE",
|
||||||
-- methods = "NONE",
|
methods = "NONE",
|
||||||
-- numbers = "NONE",
|
numbers = "NONE",
|
||||||
-- strings = "NONE",
|
strings = "NONE",
|
||||||
-- comments = "italic",
|
comments = "italic",
|
||||||
-- keywords = "bold,italic",
|
keywords = "bold,italic",
|
||||||
-- constants = "NONE",
|
constants = "NONE",
|
||||||
-- functions = "italic",
|
functions = "italic",
|
||||||
-- operators = "NONE",
|
operators = "NONE",
|
||||||
-- variables = "NONE",
|
variables = "NONE",
|
||||||
-- parameters = "NONE",
|
parameters = "NONE",
|
||||||
-- conditionals = "italic",
|
conditionals = "italic",
|
||||||
-- virtual_text = "NONE",
|
virtual_text = "NONE",
|
||||||
-- tags = "italic",
|
tags = "italic",
|
||||||
-- },
|
},
|
||||||
-- colors = {
|
colors = {
|
||||||
-- onedark = {
|
onedark = {
|
||||||
-- green = "#99c379",
|
green = "#99c379",
|
||||||
-- gray = "#8094b4",
|
gray = "#8094b4",
|
||||||
-- red = "#e06c75",
|
red = "#e06c75",
|
||||||
-- purple = "#c678dd",
|
purple = "#c678dd",
|
||||||
-- yellow = "#e5c07a",
|
yellow = "#e5c07a",
|
||||||
-- blue = "#61afef",
|
blue = "#61afef",
|
||||||
-- cyan = "#56b6c2",
|
cyan = "#56b6c2",
|
||||||
-- bg_statusline = "#282c34",
|
bg_statusline = "#282c34",
|
||||||
-- indentline = "#3b4261",
|
indentline = "#3b4261",
|
||||||
-- float_bg = "#282c34",
|
float_bg = "#282c34",
|
||||||
-- },
|
},
|
||||||
-- },
|
},
|
||||||
-- options = {
|
options = {
|
||||||
-- cursorline = true,
|
cursorline = true,
|
||||||
-- transparency = is_transparent,
|
transparency = is_transparent,
|
||||||
-- terminal_colors = true,
|
terminal_colors = true,
|
||||||
-- },
|
},
|
||||||
-- highlights = {
|
highlights = {
|
||||||
-- -- overide cursor line fill colors
|
-- overide cursor line fill colors
|
||||||
-- LineNr = { fg = "#49505E" }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set.
|
LineNr = { fg = "#49505E" }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set.
|
||||||
-- CursorLineNr = { fg = "${blue}" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line.
|
CursorLineNr = { fg = "${blue}" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line.
|
||||||
-- CursorLine = { bg = "#333842" },
|
CursorLine = { bg = "#333842" },
|
||||||
-- Cursor = { fg = "${bg}", bg = "${fg}" }, -- character under the cursor
|
Cursor = { fg = "${bg}", bg = "${fg}" }, -- character under the cursor
|
||||||
-- lCursor = { fg = "${bg}", bg = "${fg}" }, -- the character under the cursor when |language-mapping| is used (see 'guicursor')
|
lCursor = { fg = "${bg}", bg = "${fg}" }, -- the character under the cursor when |language-mapping| is used (see 'guicursor')
|
||||||
-- CursorIM = { fg = "${bg}", bg = "${fg}" }, -- like Cursor, but used when in IME mode |CursorIM|
|
CursorIM = { fg = "${bg}", bg = "${fg}" }, -- like Cursor, but used when in IME mode |CursorIM|
|
||||||
-- CursorColumn = { bg = "#333842" }, -- Screen-column at the cursor, when 'cursorcolumn' is set.
|
CursorColumn = { bg = "#333842" }, -- Screen-column at the cursor, when 'cursorcolumn' is set.
|
||||||
-- -- overide nvimtree folder icon fill color
|
-- overide nvimtree folder icon fill color
|
||||||
-- NvimTreeFolderIcon = { fg = "${gray}" },
|
NvimTreeFolderIcon = { fg = "${gray}" },
|
||||||
-- -- overide nvimtree text fill color folder opened
|
-- overide nvimtree text fill color folder opened
|
||||||
-- NvimTreeOpenedFolderName = { fg = "${blue}" },
|
NvimTreeOpenedFolderName = { fg = "${blue}" },
|
||||||
-- -- overide nvimtree text fill color root folder
|
-- overide nvimtree text fill color root folder
|
||||||
-- NvimTreeRootFolder = { fg = "${yellow}" },
|
NvimTreeRootFolder = { fg = "${yellow}" },
|
||||||
-- NvimTreeSpecialFile = { fg = "${orange}" },
|
NvimTreeSpecialFile = { fg = "${orange}" },
|
||||||
-- NvimTreeWinSeparator = { fg = "#202329" },
|
NvimTreeWinSeparator = { fg = "#202329" },
|
||||||
-- NvimTreeIndentMarker = { fg = "#3E4450" },
|
NvimTreeIndentMarker = { fg = "#3E4450" },
|
||||||
-- -- overide indenline fill color
|
-- overide indenline fill color
|
||||||
-- IblIndent = { fg = "#3E4450" },
|
IblIndent = { fg = "#3E4450" },
|
||||||
-- -- overide cmp cursorline fill color with #333842
|
-- overide cmp cursorline fill color with #333842
|
||||||
-- PmenuSel = { bg = "#333842" },
|
PmenuSel = { bg = "#333842" },
|
||||||
-- illuminatedWord = { bg = "#3b4261" },
|
illuminatedWord = { bg = "#3b4261" },
|
||||||
-- illuminatedCurWord = { bg = "#3b4261" },
|
illuminatedCurWord = { bg = "#3b4261" },
|
||||||
-- IlluminatedWordText = { bg = "#3b4261" },
|
IlluminatedWordText = { bg = "#3b4261" },
|
||||||
-- IlluminatedWordRead = { bg = "#3b4261" },
|
IlluminatedWordRead = { bg = "#3b4261" },
|
||||||
-- IlluminatedWordWrite = { bg = "#3b4261" },
|
IlluminatedWordWrite = { bg = "#3b4261" },
|
||||||
-- StatusLine = { fg = "#f8f8f2", bg = is_transparent and "NONE" or "${bg}" },
|
StatusLine = { fg = "#f8f8f2", bg = is_transparent and "NONE" or "${bg}" },
|
||||||
-- StatusLineTerm = { fg = "#f8f8f2", bg = "${bg}" },
|
StatusLineTerm = { fg = "#f8f8f2", bg = "${bg}" },
|
||||||
-- BufferLineFill = { bg = is_transparent and "NONE" or "${bg}" },
|
BufferLineFill = { bg = is_transparent and "NONE" or "${bg}" },
|
||||||
-- ["@string.special.url.html"] = { fg = "${green}" },
|
["@string.special.url.html"] = { fg = "${green}" },
|
||||||
-- ["@text.uri.html"] = { fg = "${green}" },
|
["@lsp.type.parameter"] = { fg = "${gray}" },
|
||||||
-- ["@tag.javascript"] = { fg = "${red}" },
|
-- ["@text.uri.html"] = { fg = "${green}" },
|
||||||
-- ["@tag.attribute"] = { fg = "${orange}", style = "italic" },
|
-- ["@tag.javascript"] = { fg = "${red}" },
|
||||||
-- ["@constructor.javascript"] = { fg = "${red}" },
|
-- ["@tag.attribute"] = { fg = "${orange}", style = "italic" },
|
||||||
-- ["@variable"] = { fg = "${fg}", style = "NONE" }, -- various variable names
|
-- ["@constructor.javascript"] = { fg = "${red}" },
|
||||||
-- ["@variable.builtin"] = { fg = "${red}", style = "NONE" },
|
-- ["@variable"] = { fg = "${fg}", style = "NONE" }, -- various variable names
|
||||||
-- ["@variable.member"] = "${cyan}",
|
-- ["@variable.builtin"] = { fg = "${red}", style = "NONE" },
|
||||||
-- ["@variable.parameter"] = "${red}",
|
-- ["@variable.member"] = "${cyan}",
|
||||||
-- ["@property"] = { fg = "${cyan}" }, -- similar to `@field`
|
-- ["@variable.parameter"] = "${red}",
|
||||||
-- NvimTreeGitDirty = { fg = "${yellow}" },
|
-- ["@property"] = { fg = "${cyan}" }, -- similar to `@field`
|
||||||
-- Pmenu = { fg = "${fg}", bg = "${bg}" },
|
["@property.lua"] = { fg = "${red}", bg = "NONE" },
|
||||||
-- PmenuThumb = { bg = "${gray}" }, -- Popup menu: Thumb of the scrollbar.
|
["@lsp.type.property.lua"] = { fg = "${cyan}", bg = "NONE" },
|
||||||
-- -- overide lualine fill color with bg color
|
["@lsp.type.variable.lua"] = { fg = "${red}", bg = "NONE" },
|
||||||
-- LualineNormal = { bg = "${bg}" },
|
NvimTreeGitDirty = { fg = "${yellow}" },
|
||||||
-- -- overide lualine_c fill color with bg color
|
Pmenu = { fg = "${fg}", bg = "${bg}" },
|
||||||
-- LualineC = { bg = "${bg}" },
|
PmenuThumb = { bg = "${gray}" }, -- Popup menu: Thumb of the scrollbar.
|
||||||
-- -- overide lualine_x fill color with bg color
|
-- overide lualine fill color with bg color
|
||||||
-- LualineX = { bg = "${bg}" },
|
LualineNormal = { bg = "${bg}" },
|
||||||
-- -- overide which-key fill color with bg color
|
-- overide lualine_c fill color with bg color
|
||||||
-- -- WhichKey = { bg = "${bg}" },
|
LualineC = { bg = "${bg}" },
|
||||||
-- -- -- overide which-key fill color with bg color
|
-- overide lualine_x fill color with bg color
|
||||||
-- -- WhichKeySeperator = { bg = "${bg}" },
|
LualineX = { bg = "${bg}" },
|
||||||
-- -- -- overide which-key fill color with bg color
|
-- overide which-key fill color with bg color
|
||||||
-- -- WhichKeyDesc = { fg = "${red}" },
|
-- WhichKey = { bg = "${bg}" },
|
||||||
-- -- -- overide which-key fill color with bg color
|
-- -- overide which-key fill color with bg color
|
||||||
-- -- WhichKeyFloat = { bg = "${bg}" },
|
-- WhichKeySeperator = { bg = "${bg}" },
|
||||||
-- WhichKeyFloat = { bg = is_transparent and "NONE" or "${bg}" },
|
-- -- overide which-key fill color with bg color
|
||||||
-- -- -- overide which-key fill color with bg color
|
-- WhichKeyDesc = { fg = "${red}" },
|
||||||
-- -- WhichKeyValue = { bg = "${bg}" },
|
-- -- overide which-key fill color with bg color
|
||||||
-- -- -- overide which-key fill color with bg color
|
-- WhichKeyFloat = { bg = "${bg}" },
|
||||||
-- -- WhichKeyBorder = { bg = "${bg}" },
|
WhichKeyFloat = { bg = is_transparent and "NONE" or "${bg}" },
|
||||||
-- },
|
-- -- overide which-key fill color with bg color
|
||||||
-- })
|
-- WhichKeyValue = { bg = "${bg}" },
|
||||||
-- end,
|
-- -- overide which-key fill color with bg color
|
||||||
-- },
|
-- WhichKeyBorder = { bg = "${bg}" },
|
||||||
|
},
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue