💅 style(ui): update onedark theme colors for chadwal colorscheme
This commit is contained in:
18 files changed
+1476
-293
No files matched your search
+37
-27
@@ -4,6 +4,7 @@ local model_names = {
|
||||
'claude-3.5-sonnet',
|
||||
'claude-3.7-sonnet',
|
||||
'claude-3.7-sonnet-thought',
|
||||
'claude-sonnet-4',
|
||||
'gemini-2.0-flash-001',
|
||||
'gemini-2.5-pro',
|
||||
'gpt-4.1',
|
||||
@@ -13,38 +14,36 @@ local model_names = {
|
||||
'o4-mini',
|
||||
}
|
||||
|
||||
-- Generate provider configurations for each model
|
||||
local function generate_providers()
|
||||
local providers_table = {}
|
||||
for _, model_name in ipairs(model_names) do
|
||||
local provider_key = 'copilot-' .. model_name
|
||||
providers_table[provider_key] = {
|
||||
__inherited_from = 'copilot',
|
||||
model = model_name,
|
||||
display_name = provider_key,
|
||||
}
|
||||
end
|
||||
return providers_table
|
||||
end
|
||||
|
||||
avante.setup({
|
||||
mode = 'agentic',
|
||||
provider = 'copilot-claude-3.5-sonnet',
|
||||
provider = 'copilot-gpt-4.1',
|
||||
-- cursor_applying_provider = 'copilot-o3-mini',
|
||||
-- auto_suggestions_provider = 'copilot-claude-3.7-sonnet',
|
||||
|
||||
providers = vim.tbl_extend('force', {
|
||||
copilot = {
|
||||
endpoint = 'https://api.githubcopilot.com',
|
||||
allow_insecure = false,
|
||||
timeout = 10 * 60 * 1000,
|
||||
extra_request_body = {
|
||||
temperature = 0,
|
||||
|
||||
providers = (function()
|
||||
local providers_table = {
|
||||
copilot = {
|
||||
endpoint = 'https://api.githubcopilot.com',
|
||||
allow_insecure = false,
|
||||
timeout = 10 * 60 * 1000,
|
||||
extra_request_body = {
|
||||
temperature = 0,
|
||||
max_completion_tokens = 1000000,
|
||||
reasoning_effort = 'high',
|
||||
},
|
||||
},
|
||||
max_completion_tokens = 1000000,
|
||||
reasoning_effort = 'high',
|
||||
}
|
||||
}, generate_providers()),
|
||||
for _, model_name in ipairs(model_names) do
|
||||
local provider_key = 'copilot-' .. model_name
|
||||
providers_table[provider_key] = {
|
||||
__inherited_from = 'copilot',
|
||||
model = model_name,
|
||||
display_name = provider_key,
|
||||
}
|
||||
end
|
||||
|
||||
return providers_table
|
||||
end)(),
|
||||
|
||||
behaviour = {
|
||||
auto_suggestions = false,
|
||||
@@ -168,6 +167,17 @@ avante.setup({
|
||||
require('mcphub.extensions.avante').mcp_tool(),
|
||||
}
|
||||
end,
|
||||
disabled_tools = {},
|
||||
disabled_tools = {
|
||||
'list_files',
|
||||
'search_files',
|
||||
'read_file',
|
||||
'create_file',
|
||||
'rename_file',
|
||||
'delete_file',
|
||||
'create_dir',
|
||||
'rename_dir',
|
||||
'delete_dir',
|
||||
'bash',
|
||||
},
|
||||
slash_commands = {},
|
||||
})
|
||||
@@ -9,6 +9,7 @@ mcphub.setup({
|
||||
auto_toggle_mcp_servers = true,
|
||||
extensions = {
|
||||
avante = {
|
||||
enabled = true,
|
||||
make_slash_commands = true,
|
||||
},
|
||||
},
|
||||
@@ -37,4 +38,4 @@ mcphub.setup({
|
||||
file_path = vim.fn.stdpath('state') .. '/mcphub.log',
|
||||
prefix = 'MCPHub',
|
||||
},
|
||||
})
|
||||
})
|
||||
+117
-95
@@ -1,109 +1,131 @@
|
||||
local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
|
||||
-- put this in your main init.lua file ( before lazy setup )
|
||||
vim.g.base46_cache = vim.fn.stdpath('data') .. '/base46_cache/'
|
||||
|
||||
local lazypath = vim.fn.stdpath('data') .. '/lazy/lazy.nvim'
|
||||
if not vim.loop.fs_stat(lazypath) then
|
||||
vim.fn.system({
|
||||
"git",
|
||||
"clone",
|
||||
"--filter=blob:none",
|
||||
"--single-branch",
|
||||
"https://github.com/folke/lazy.nvim.git",
|
||||
lazypath,
|
||||
})
|
||||
vim.fn.system({
|
||||
'git',
|
||||
'clone',
|
||||
'--filter=blob:none',
|
||||
'--single-branch',
|
||||
'https://github.com/folke/lazy.nvim.git',
|
||||
lazypath,
|
||||
})
|
||||
end
|
||||
vim.opt.runtimepath:prepend(lazypath)
|
||||
|
||||
local status_ok, lazy = pcall(require, "lazy")
|
||||
local status_ok, lazy = pcall(require, 'lazy')
|
||||
if not status_ok then
|
||||
return
|
||||
return
|
||||
end
|
||||
|
||||
local icons = require("lib.icons")
|
||||
local plugins = require("plugins.list").plugins
|
||||
local icons = require('lib.icons')
|
||||
local plugins = require('plugins.list').plugins
|
||||
|
||||
lazy.setup({
|
||||
root = vim.fn.stdpath("data") .. "/lazy",
|
||||
defaults = { lazy = true },
|
||||
spec = plugins,
|
||||
lockfile = vim.fn.stdpath("config") .. "/lua/plugins/lock.json",
|
||||
concurrency = 8,
|
||||
dev = { path = "~/Projects/Github", patterns = { "Projects" }, fallback = true },
|
||||
install = { missing = true, colorscheme = { "onedark" } },
|
||||
root = vim.fn.stdpath('data') .. '/lazy',
|
||||
defaults = { lazy = true },
|
||||
spec = plugins,
|
||||
lockfile = vim.fn.stdpath('config') .. '/lua/plugins/lock.json',
|
||||
concurrency = 8,
|
||||
dev = { path = '~/Projects/Github', patterns = { 'Projects' }, fallback = true },
|
||||
install = { missing = true, colorscheme = { 'nvchad' } },
|
||||
|
||||
git = {
|
||||
log = { "--since=3 days ago" },
|
||||
timeout = 120,
|
||||
url_format = "https://github.com/%s.git",
|
||||
filter = true,
|
||||
},
|
||||
git = {
|
||||
log = { '--since=3 days ago' },
|
||||
timeout = 120,
|
||||
url_format = 'https://github.com/%s.git',
|
||||
filter = true,
|
||||
},
|
||||
|
||||
ui = {
|
||||
size = { width = 0.9, height = 0.8 },
|
||||
wrap = true,
|
||||
border = "rounded",
|
||||
icons = {
|
||||
cmd = icons.ui.Terminal,
|
||||
config = icons.ui.Gear,
|
||||
event = icons.ui.Electric,
|
||||
ft = icons.documents.File,
|
||||
init = icons.ui.Rocket,
|
||||
import = icons.documents.Import,
|
||||
keys = icons.ui.Keyboard,
|
||||
lazy = icons.ui.Sleep,
|
||||
loaded = icons.ui.CircleSmall,
|
||||
not_loaded = icons.ui.CircleSmallEmpty,
|
||||
plugin = icons.ui.Package,
|
||||
runtime = icons.ui.Neovim,
|
||||
source = icons.ui.Code,
|
||||
start = icons.ui.Play,
|
||||
task = icons.ui.Check,
|
||||
list = {
|
||||
icons.ui.CircleSmall,
|
||||
icons.ui.Arrow,
|
||||
icons.ui.Star,
|
||||
icons.ui.Minus,
|
||||
},
|
||||
},
|
||||
browser = nil,
|
||||
throttle = 20,
|
||||
custom_keys = {
|
||||
["<localleader>l"] = function(plugin)
|
||||
require("lazy.util").float_term({ "lazygit", "log" }, {
|
||||
cwd = plugin.dir,
|
||||
})
|
||||
end,
|
||||
ui = {
|
||||
size = { width = 0.9, height = 0.8 },
|
||||
wrap = true,
|
||||
border = 'rounded',
|
||||
icons = {
|
||||
cmd = icons.ui.Terminal,
|
||||
config = icons.ui.Gear,
|
||||
event = icons.ui.Electric,
|
||||
ft = icons.documents.File,
|
||||
init = icons.ui.Rocket,
|
||||
import = icons.documents.Import,
|
||||
keys = icons.ui.Keyboard,
|
||||
lazy = icons.ui.Sleep,
|
||||
loaded = icons.ui.CircleSmall,
|
||||
not_loaded = icons.ui.CircleSmallEmpty,
|
||||
plugin = icons.ui.Package,
|
||||
runtime = icons.ui.Neovim,
|
||||
source = icons.ui.Code,
|
||||
start = icons.ui.Play,
|
||||
task = icons.ui.Check,
|
||||
list = {
|
||||
icons.ui.CircleSmall,
|
||||
icons.ui.Arrow,
|
||||
icons.ui.Star,
|
||||
icons.ui.Minus,
|
||||
},
|
||||
},
|
||||
browser = nil,
|
||||
throttle = 20,
|
||||
custom_keys = {
|
||||
['<localleader>l'] = function(plugin)
|
||||
require('lazy.util').float_term({ 'lazygit', 'log' }, {
|
||||
cwd = plugin.dir,
|
||||
})
|
||||
end,
|
||||
|
||||
["<localleader>t"] = function(plugin)
|
||||
require("lazy.util").float_term(nil, {
|
||||
cwd = plugin.dir,
|
||||
})
|
||||
end,
|
||||
},
|
||||
},
|
||||
['<localleader>t'] = function(plugin)
|
||||
require('lazy.util').float_term(nil, {
|
||||
cwd = plugin.dir,
|
||||
})
|
||||
end,
|
||||
},
|
||||
},
|
||||
|
||||
diff = { cmd = "git" },
|
||||
checker = { enabled = false, concurrency = nil, notify = true, frequency = 3600 },
|
||||
change_detection = { enabled = true, notify = true },
|
||||
performance = {
|
||||
cache = { enabled = true },
|
||||
reset_packpath = true,
|
||||
rtp = {
|
||||
reset = true,
|
||||
paths = {},
|
||||
disabled_plugins = {
|
||||
"gzip",
|
||||
"tarPlugin",
|
||||
"zipPlugin",
|
||||
"tohtml",
|
||||
-- 'tutor',
|
||||
-- 'matchit',
|
||||
-- 'matchparen',
|
||||
-- 'netrwPlugin',
|
||||
},
|
||||
},
|
||||
},
|
||||
readme = {
|
||||
root = vim.fn.stdpath("state") .. "/lazy/readme",
|
||||
files = { "README.md", "lua/**/README.md" },
|
||||
skip_if_doc_exists = true,
|
||||
},
|
||||
state = vim.fn.stdpath("state") .. "/lazy/state.json",
|
||||
diff = { cmd = 'git' },
|
||||
checker = { enabled = false, concurrency = nil, notify = true, frequency = 3600 },
|
||||
change_detection = { enabled = true, notify = true },
|
||||
performance = {
|
||||
cache = { enabled = true },
|
||||
reset_packpath = true,
|
||||
rtp = {
|
||||
reset = true,
|
||||
paths = {},
|
||||
disabled_plugins = {
|
||||
'gzip',
|
||||
'tarPlugin',
|
||||
'zipPlugin',
|
||||
'tohtml',
|
||||
-- 'tutor',
|
||||
-- 'matchit',
|
||||
-- 'matchparen',
|
||||
-- 'netrwPlugin',
|
||||
},
|
||||
},
|
||||
},
|
||||
readme = {
|
||||
root = vim.fn.stdpath('state') .. '/lazy/readme',
|
||||
files = { 'README.md', 'lua/**/README.md' },
|
||||
skip_if_doc_exists = true,
|
||||
},
|
||||
state = vim.fn.stdpath('state') .. '/lazy/state.json',
|
||||
})
|
||||
|
||||
-- put this after lazy setup
|
||||
-- Load base46 cache files if they exist
|
||||
local function load_base46_cache()
|
||||
local cache_dir = vim.g.base46_cache
|
||||
|
||||
-- Check if cache files exist, if not try to generate them
|
||||
if not vim.loop.fs_stat(cache_dir .. 'defaults') then
|
||||
pcall(function()
|
||||
require('base46').load_all_highlights()
|
||||
end)
|
||||
end
|
||||
|
||||
-- Load cache files
|
||||
pcall(dofile, cache_dir .. 'defaults')
|
||||
pcall(dofile, cache_dir .. 'statusline')
|
||||
end
|
||||
|
||||
load_base46_cache()
|
||||
+13
-2
@@ -8,10 +8,21 @@ end
|
||||
local plugins = {
|
||||
-- UI
|
||||
{
|
||||
'navarasu/onedark.nvim',
|
||||
config = load_config('ui.onedark'),
|
||||
'nvchad/ui',
|
||||
config = function()
|
||||
require('nvchad')
|
||||
end,
|
||||
},
|
||||
{
|
||||
'nvchad/base46',
|
||||
lazy = false,
|
||||
priority = 1000,
|
||||
build = function()
|
||||
require('base46').load_all_highlights()
|
||||
end,
|
||||
config = function()
|
||||
require('base46').load_all_highlights()
|
||||
end,
|
||||
},
|
||||
{ 'nvim-tree/nvim-web-devicons' },
|
||||
{
|
||||
|
||||
+19
-18
@@ -1,34 +1,35 @@
|
||||
{
|
||||
"LuaSnip": { "branch": "master", "commit": "fb525166ccc30296fb3457441eb979113de46b00" },
|
||||
"LuaSnip": { "branch": "master", "commit": "66b5c2707e624dcd2cd3605676c64a2efe47e9d1" },
|
||||
"Navigator.nvim": { "branch": "master", "commit": "91d86506ac2a039504d5205d32a1d4bc7aa57072" },
|
||||
"avante.nvim": { "branch": "main", "commit": "fdf4716ec04cf5d9f8f39a44b7d42ab37cc2bd40" },
|
||||
"blink-cmp-avante": { "branch": "master", "commit": "ddefb8de3cb1286ab39e0ccec0f32a45d03391f2" },
|
||||
"avante.nvim": { "branch": "main", "commit": "c20e4e8f05b79015f1c7a2178da5298e431e58a8" },
|
||||
"base46": { "branch": "v3.0", "commit": "2dbb72f4ae6f78cb3adc60c2c3b69524f97c9cd6" },
|
||||
"blink-cmp-avante": { "branch": "master", "commit": "5cf0854b065073083de72d9a988cff1c4b419148" },
|
||||
"blink-cmp-copilot": { "branch": "main", "commit": "439cff78780c033aa23cf061d7315314b347e3c1" },
|
||||
"blink.cmp": { "branch": "main", "commit": "022521a8910a5543b0251b21c9e1a1e989745796" },
|
||||
"blink.cmp": { "branch": "main", "commit": "9bcb14b43852a6f2bfd5ac9ef29cb5cf09b1b39b" },
|
||||
"ccc.nvim": { "branch": "main", "commit": "9d1a256e006decc574789dfc7d628ca11644d4c2" },
|
||||
"codesnap.nvim": { "branch": "main", "commit": "be6d6b9a3b5e6999edbda76b16dace03d9bfcd3d" },
|
||||
"comment-box.nvim": { "branch": "main", "commit": "06bb771690bc9df0763d14769b779062d8f12bc5" },
|
||||
"copilot.lua": { "branch": "master", "commit": "c1bb86abbed1a52a11ab3944ef00c8410520543d" },
|
||||
"copilot.lua": { "branch": "master", "commit": "3680bebcc95dfd6c7509466367e66f6dc64a5140" },
|
||||
"esqueleto.nvim": { "branch": "main", "commit": "d495d8aecf6d8cc87b8f9b82276cd88393ce014b" },
|
||||
"flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
|
||||
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
|
||||
"gitlinker.nvim": { "branch": "master", "commit": "cc59f732f3d043b626c8702cb725c82e54d35c25" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "731b581428ec6c1ccb451b95190ebbc6d7006db7" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "7bbc674278f22376850576dfdddf43bbc17e62b5" },
|
||||
"hardtime.nvim": { "branch": "main", "commit": "5d9adcbe2f12741de79e435c8b85dca69a3b22e4" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
|
||||
"lspsaga.nvim": { "branch": "main", "commit": "920b1253e1a26732e53fac78412f6da7f674671d" },
|
||||
"lspsaga.nvim": { "branch": "main", "commit": "8efe00d6aed9db6449969f889170f1a7e43101a1" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
|
||||
"markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
|
||||
"markit.nvim": { "branch": "main", "commit": "9b031afab214aa6e6467f275f55640989f438925" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "bef29b653ba71d442816bf56286c2a686210be04" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "7815740f4d0afb74ada00956c36e18ad695ed9e3" },
|
||||
"mason-null-ls.nvim": { "branch": "main", "commit": "de19726de7260c68d94691afb057fa73d3cc53e7" },
|
||||
"mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
|
||||
"mcphub.nvim": { "branch": "main", "commit": "4888f27a2c0122d351a337e7576797f4a63df166" },
|
||||
"mcphub.nvim": { "branch": "main", "commit": "e0b62926d9fa65c81bd0f369b23cbd1eafe3cc6e" },
|
||||
"mini.ai": { "branch": "main", "commit": "e139eb1101beb0250fea322f8c07a42f0f175688" },
|
||||
"mini.bracketed": { "branch": "main", "commit": "079b8375e40ebf3f8af319ad835263ff390c3965" },
|
||||
"mini.bracketed": { "branch": "main", "commit": "a54a2a180dc40f4d85875eeafacbdf991d042a36" },
|
||||
"mini.files": { "branch": "main", "commit": "49c855977e9f4821d1ed8179ed44fe098b93ea2a" },
|
||||
"mini.pairs": { "branch": "main", "commit": "69864a2efb36c030877421634487fd90db1e4298" },
|
||||
"mini.pairs": { "branch": "main", "commit": "42407ccb80ec59c84e7c91d815f42ed90a8cc093" },
|
||||
"mini.surround": { "branch": "main", "commit": "5aab42fcdcf31fa010f012771eda5631c077840a" },
|
||||
"neotest": { "branch": "master", "commit": "d66cf4e05a116957f0d3a7755a24291c7d1e1f72" },
|
||||
"neotypist.nvim": { "branch": "master", "commit": "23570aedca4bb4d92967ac82e053cf4d4903abe9" },
|
||||
@@ -36,28 +37,28 @@
|
||||
"nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
|
||||
"nvim-dap": { "branch": "master", "commit": "99807078c5089ed30e0547aa4b52c5867933f426" },
|
||||
"nvim-dbee": { "branch": "master", "commit": "9656fc59841291e9dbd2f3b50b1cb4c77d9fea79" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "583a1d555c8e407868ce00c57e37eca4b7ff960e" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "dbdb80d3bd311989d21029c63918d67a786d5013" },
|
||||
"nvim-spectre": { "branch": "master", "commit": "72f56f7585903cd7bf92c665351aa585e150af0f" },
|
||||
"nvim-spider": { "branch": "main", "commit": "99df646eab60df0b948dd2532ef5f5512707a9a4" },
|
||||
"nvim-spider": { "branch": "main", "commit": "d4bdc45eac425e77108f068bd0706ff3ac20be7f" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||
"nvim-treesitter-refactor": { "branch": "master", "commit": "d8b74fa87afc6a1e97b18da23e762efb032dc270" },
|
||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "0f051e9813a36481f48ca1f833897210dbcfffde" },
|
||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "89ebe73cd2836db80a22d9748999ace0241917a5" },
|
||||
"nvim-treesitter-textsubjects": { "branch": "master", "commit": "abcbb0e537c9c24800b03b9ca33bee5806604629" },
|
||||
"nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "a1366758b3a232036dc97be8ca41184aa3f50506" },
|
||||
"octohub.nvim": { "branch": "main", "commit": "f09627325ab550ca4ff640d4589cf88b8342e63e" },
|
||||
"onedark.nvim": { "branch": "master", "commit": "11de4da47f3e69cb70c3ae9816bd8af166cbe121" },
|
||||
"pickme.nvim": { "branch": "main", "commit": "70e8c040a6c01b34a6a7e05aff6ebb241211fc6d" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
||||
"showkeys": { "branch": "main", "commit": "cb0a50296f11f1e585acffba8c253b9e8afc1f84" },
|
||||
"smear-cursor.nvim": { "branch": "main", "commit": "aff844fc1483fd673f721a41affcd7e2fcb885f5" },
|
||||
"smear-cursor.nvim": { "branch": "main", "commit": "4a0f7ac265b4ed1ce4d0af2afc13072763bfa691" },
|
||||
"snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
|
||||
"sniprun": { "branch": "master", "commit": "a90c65846c3c18efc3f799d8b6dc26af9d4a69ed" },
|
||||
"substitute.nvim": { "branch": "main", "commit": "9db749a880e3dd3b0eb57f698aa8f1e1630e1f25" },
|
||||
"termim.nvim": { "branch": "main", "commit": "6bb3f8fb5a3c64ca614d7c4782d4965863c41675" },
|
||||
"toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
|
||||
"ui": { "branch": "v3.0", "commit": "4c632329bf2a745c6e06c2012bcf432eb7af3135" },
|
||||
"utils.nvim": { "branch": "main", "commit": "0e545d194b8eab9870da8e3cdc728fbcfa6a5a19" },
|
||||
"vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
|
||||
"vim-fugitive": { "branch": "master", "commit": "593f831d6f6d779cbabb70a4d1e6b1b1936a88af" },
|
||||
"vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" },
|
||||
"vim-wakatime": { "branch": "master", "commit": "f39c4a201ae350aaba713b59d4a4fdd88e0811aa" },
|
||||
"which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
|
||||
|
||||
+76
-29
@@ -1,34 +1,23 @@
|
||||
local lualine = require('lualine')
|
||||
local icons = require('lib.icons')
|
||||
|
||||
local colors = {
|
||||
bg = '#000000',
|
||||
fg = '#bbc2cf',
|
||||
yellow = '#ECBE7B',
|
||||
cyan = '#008080',
|
||||
darkblue = '#081633',
|
||||
green = '#98be65',
|
||||
orange = '#FF8800',
|
||||
violet = '#a9a1e1',
|
||||
magenta = '#c678dd',
|
||||
blue = '#51afef',
|
||||
red = '#ec5f67',
|
||||
}
|
||||
-- Get colors from base46 theme (chadwal)
|
||||
local colors = require("base46").get_theme_tb "base_30"
|
||||
|
||||
local mode_color = {
|
||||
n = colors.green,
|
||||
i = colors.blue,
|
||||
v = colors.magenta,
|
||||
[''] = colors.magenta,
|
||||
V = colors.magenta,
|
||||
v = colors.pink,
|
||||
[''] = colors.pink,
|
||||
V = colors.pink,
|
||||
c = colors.yellow,
|
||||
t = colors.red,
|
||||
R = colors.orange,
|
||||
Rv = colors.orange,
|
||||
no = colors.fg,
|
||||
s = colors.violet,
|
||||
S = colors.violet,
|
||||
[''] = colors.violet,
|
||||
no = colors.white,
|
||||
s = colors.purple,
|
||||
S = colors.purple,
|
||||
[''] = colors.purple,
|
||||
ic = colors.yellow,
|
||||
cv = colors.red,
|
||||
ce = colors.red,
|
||||
@@ -58,17 +47,17 @@ local conditions = {
|
||||
end,
|
||||
}
|
||||
|
||||
local searchcount = { 'searchcount', color = { fg = colors.fg, gui = 'bold' } }
|
||||
local selectioncount = { 'selectioncount', color = { fg = colors.fg, gui = 'bold' } }
|
||||
local progress = { 'progress', color = { fg = colors.fg, gui = 'bold' } }
|
||||
local searchcount = { 'searchcount', color = { fg = colors.white, gui = 'bold' } }
|
||||
local selectioncount = { 'selectioncount', color = { fg = colors.white, gui = 'bold' } }
|
||||
local progress = { 'progress', color = { fg = colors.white, gui = 'bold' } }
|
||||
local filetype = { 'filetype', color = { fg = colors.blue, gui = 'bold' } }
|
||||
local filesize = { 'filesize', color = { fg = colors.fg, gui = 'bold' }, cond = conditions.buffer_not_empty }
|
||||
local filesize = { 'filesize', color = { fg = colors.white, gui = 'bold' }, cond = conditions.buffer_not_empty }
|
||||
local fileformat = { 'fileformat', icons_enabled = true, color = { fg = colors.white, gui = 'bold' } }
|
||||
|
||||
local filename = {
|
||||
'filename',
|
||||
cond = conditions.buffer_not_empty and conditions.buffer_is_file and conditions.buffer_not_scratch,
|
||||
color = { fg = colors.magenta, gui = 'bold' },
|
||||
color = { fg = colors.pink, gui = 'bold' },
|
||||
}
|
||||
|
||||
local buffers = {
|
||||
@@ -145,7 +134,7 @@ local lsp = {
|
||||
return msg
|
||||
end,
|
||||
icon = icons.ui.Gear,
|
||||
color = { fg = colors.fg, gui = 'bold' },
|
||||
color = { fg = colors.white, gui = 'bold' },
|
||||
}
|
||||
|
||||
local encoding = {
|
||||
@@ -168,14 +157,72 @@ local function mode(icon)
|
||||
}
|
||||
end
|
||||
|
||||
local custom_onedark = require('lualine.themes.onedark')
|
||||
custom_onedark.normal.c.bg = colors.bg
|
||||
-- Modify the onedark theme to use chadwal colors
|
||||
local custom_theme = require('lualine.themes.onedark')
|
||||
|
||||
-- Update normal mode
|
||||
custom_theme.normal.a.fg = colors.black
|
||||
custom_theme.normal.a.bg = colors.green
|
||||
custom_theme.normal.b.fg = colors.white
|
||||
custom_theme.normal.b.bg = colors.one_bg2
|
||||
custom_theme.normal.c.fg = colors.white
|
||||
custom_theme.normal.c.bg = colors.black
|
||||
|
||||
-- Update insert mode
|
||||
custom_theme.insert.a.fg = colors.black
|
||||
custom_theme.insert.a.bg = colors.blue
|
||||
custom_theme.insert.b.fg = colors.white
|
||||
custom_theme.insert.b.bg = colors.one_bg2
|
||||
custom_theme.insert.c.fg = colors.white
|
||||
custom_theme.insert.c.bg = colors.black
|
||||
|
||||
-- Update visual mode
|
||||
custom_theme.visual.a.fg = colors.black
|
||||
custom_theme.visual.a.bg = colors.pink
|
||||
custom_theme.visual.b.fg = colors.white
|
||||
custom_theme.visual.b.bg = colors.one_bg2
|
||||
custom_theme.visual.c.fg = colors.white
|
||||
custom_theme.visual.c.bg = colors.black
|
||||
|
||||
-- Update replace mode
|
||||
custom_theme.replace.a.fg = colors.black
|
||||
custom_theme.replace.a.bg = colors.red
|
||||
custom_theme.replace.b.fg = colors.white
|
||||
custom_theme.replace.b.bg = colors.one_bg2
|
||||
custom_theme.replace.c.fg = colors.white
|
||||
custom_theme.replace.c.bg = colors.black
|
||||
|
||||
-- Update command mode
|
||||
custom_theme.command.a.fg = colors.black
|
||||
custom_theme.command.a.bg = colors.yellow
|
||||
custom_theme.command.b.fg = colors.white
|
||||
custom_theme.command.b.bg = colors.one_bg2
|
||||
custom_theme.command.c.fg = colors.white
|
||||
custom_theme.command.c.bg = colors.black
|
||||
|
||||
-- Update inactive mode
|
||||
custom_theme.inactive.a.fg = colors.grey
|
||||
custom_theme.inactive.a.bg = colors.black
|
||||
custom_theme.inactive.b.fg = colors.grey
|
||||
custom_theme.inactive.b.bg = colors.black
|
||||
custom_theme.inactive.c.fg = colors.grey
|
||||
custom_theme.inactive.c.bg = colors.black
|
||||
|
||||
-- Update tabline to match theme
|
||||
if custom_theme.tabline then
|
||||
custom_theme.tabline.a.fg = colors.white
|
||||
custom_theme.tabline.a.bg = colors.one_bg2
|
||||
custom_theme.tabline.b.fg = colors.white
|
||||
custom_theme.tabline.b.bg = colors.black
|
||||
custom_theme.tabline.c.fg = colors.grey
|
||||
custom_theme.tabline.c.bg = colors.black
|
||||
end
|
||||
|
||||
lualine.setup({
|
||||
options = {
|
||||
component_separators = '',
|
||||
-- section_separators = '',
|
||||
theme = custom_onedark,
|
||||
theme = custom_theme,
|
||||
disabled_filetypes = {
|
||||
'dashboard',
|
||||
},
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
local onedark = require('onedark')
|
||||
|
||||
onedark.setup({
|
||||
style = 'deep',
|
||||
transparent = true,
|
||||
term_colors = false,
|
||||
ending_tildes = false,
|
||||
cmp_itemkind_reverse = false,
|
||||
|
||||
toggle_style_key = '<leader>ot',
|
||||
toggle_style_list = { 'dark', 'darker', 'cool', 'warm', 'warmer', 'deep', 'light' },
|
||||
|
||||
-- Options are italic, bold, underline, none and combos 'italic,bold'
|
||||
code_style = {
|
||||
comments = 'italic',
|
||||
keywords = 'none',
|
||||
functions = 'none',
|
||||
strings = 'none',
|
||||
variables = 'none',
|
||||
},
|
||||
|
||||
lualine = { transparent = true },
|
||||
diagnostics = { darker = true, undercurl = true, background = false },
|
||||
})
|
||||
onedark.load()
|
||||
Reference in new issue
Block a user