From 17384b97bb847449fac4790c42db117306e6da31 Mon Sep 17 00:00:00 2001 From: S4NKALP Date: Fri, 11 Jul 2025 07:55:59 +0545 Subject: [PATCH] =?UTF-8?q?=F0=9F=92=85=20style(ui):=20update=20onedark=20?= =?UTF-8?q?theme=20colors=20for=20chadwal=20colorscheme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- init.lua | 19 +- lua/chadrc.lua | 8 + lua/core/autocmd.lua | 188 ++++++----- lua/core/keys.lua | 6 + lua/plugins/ai/avante.lua | 64 ++-- lua/plugins/ai/mcphub.lua | 3 +- lua/plugins/lazy.lua | 212 ++++++------ lua/plugins/list.lua | 15 +- lua/plugins/lock.json | 37 +- lua/plugins/ui/lualine.lua | 105 ++++-- lua/plugins/ui/onedark.lua | 25 -- pywal/.gitignore | 1 + pywal/LICENSE | 674 +++++++++++++++++++++++++++++++++++++ pywal/README.md | 71 ++++ pywal/chadwal.py | 120 +++++++ pywal/dark.lua | 70 ++++ pywal/light.lua | 70 ++++ pywal/matugen.lua | 81 +++++ 18 files changed, 1476 insertions(+), 293 deletions(-) create mode 100644 lua/chadrc.lua delete mode 100644 lua/plugins/ui/onedark.lua create mode 100644 pywal/.gitignore create mode 100644 pywal/LICENSE create mode 100644 pywal/README.md create mode 100644 pywal/chadwal.py create mode 100644 pywal/dark.lua create mode 100644 pywal/light.lua create mode 100644 pywal/matugen.lua diff --git a/init.lua b/init.lua index c5c1c43..d7a1edc 100644 --- a/init.lua +++ b/init.lua @@ -1,7 +1,14 @@ -require("core.options") -require("core.functions") -require("core.keys") -require("core.autocmd") -require("plugins.lazy") +require('core.options') +require('core.functions') +require('core.keys') +require('core.autocmd') +require('plugins.lazy') -- Add user configs to this module -pcall(require, "user") +pcall(require, 'user') + +-- load theme +dofile(vim.g.base46_cache .. 'defaults') +dofile(vim.g.base46_cache .. 'statusline') + +-- Run pywal chadwal script silently in background +os.execute('python3 ~/.config/nvim/pywal/chadwal.py &> /dev/null &') diff --git a/lua/chadrc.lua b/lua/chadrc.lua new file mode 100644 index 0000000..e02dc9b --- /dev/null +++ b/lua/chadrc.lua @@ -0,0 +1,8 @@ +---@type ChadrcConfig +local M = {} + +M.base46 = { + theme = "chadwal", +} + +return M \ No newline at end of file diff --git a/lua/core/autocmd.lua b/lua/core/autocmd.lua index c150940..cb9ceae 100644 --- a/lua/core/autocmd.lua +++ b/lua/core/autocmd.lua @@ -1,129 +1,137 @@ local function augroup(name) - return vim.api.nvim_create_augroup("keycodex" .. name, { clear = true }) + return vim.api.nvim_create_augroup('keycodex' .. name, { clear = true }) end -- Strip trailing spaces before write -vim.api.nvim_create_autocmd({ "BufWritePre" }, { - group = augroup("strip_space"), - pattern = { "*" }, - callback = function() - vim.cmd([[ %s/\s\+$//e ]]) - end, +vim.api.nvim_create_autocmd({ 'BufWritePre' }, { + group = augroup('strip_space'), + pattern = { '*' }, + callback = function() + vim.cmd([[ %s/\s\+$//e ]]) + end, }) -- Check if we need to reload the file when it changed -vim.api.nvim_create_autocmd({ "FocusGained", "TermClose", "TermLeave" }, { - group = augroup("checktime"), - command = "checktime", +vim.api.nvim_create_autocmd({ 'FocusGained', 'TermClose', 'TermLeave' }, { + group = augroup('checktime'), + command = 'checktime', }) -- Highlight on yank -vim.api.nvim_create_autocmd("TextYankPost", { - group = augroup("highlight_yank"), - callback = function() - vim.highlight.on_yank() - end, +vim.api.nvim_create_autocmd('TextYankPost', { + group = augroup('highlight_yank'), + callback = function() + vim.highlight.on_yank() + end, }) -- resize splits if window got resized -vim.api.nvim_create_autocmd({ "VimResized" }, { - group = augroup("resize_splits"), - callback = function() - vim.cmd("tabdo wincmd =") - end, +vim.api.nvim_create_autocmd({ 'VimResized' }, { + group = augroup('resize_splits'), + callback = function() + vim.cmd('tabdo wincmd =') + end, }) -- go to last loc when opening a buffer -vim.api.nvim_create_autocmd("BufReadPost", { - group = augroup("last_loc"), - callback = function() - local mark = vim.api.nvim_buf_get_mark(0, '"') - local lcount = vim.api.nvim_buf_line_count(0) - if mark[1] > 0 and mark[1] <= lcount then - pcall(vim.api.nvim_win_set_cursor, 0, mark) - end - end, +vim.api.nvim_create_autocmd('BufReadPost', { + group = augroup('last_loc'), + callback = function() + local mark = vim.api.nvim_buf_get_mark(0, '"') + local lcount = vim.api.nvim_buf_line_count(0) + if mark[1] > 0 and mark[1] <= lcount then + pcall(vim.api.nvim_win_set_cursor, 0, mark) + end + end, }) -- close some filetypes with -vim.api.nvim_create_autocmd("FileType", { - group = augroup("close_with_q"), - pattern = { - "Jaq", - "PlenaryTestPopup", - "Avante", - "AvanteInput", - "AvanteSelectedFiles", - "fugitive", - "git", - "help", - "lir", - "lspinfo", - "man", - "netrw", - "notify", - "qf", - "spectre_panel", - "startuptime", - "tsplayground", - }, - callback = function(event) - vim.bo[event.buf].buflisted = false - vim.keymap.set("n", "q", "close", { buffer = event.buf, silent = true }) - end, +vim.api.nvim_create_autocmd('FileType', { + group = augroup('close_with_q'), + pattern = { + 'Jaq', + 'PlenaryTestPopup', + 'Avante', + 'AvanteInput', + 'AvanteSelectedFiles', + 'fugitive', + 'git', + 'help', + 'lir', + 'lspinfo', + 'man', + 'netrw', + 'notify', + 'qf', + 'spectre_panel', + 'startuptime', + 'tsplayground', + }, + callback = function(event) + vim.bo[event.buf].buflisted = false + vim.keymap.set('n', 'q', 'close', { buffer = event.buf, silent = true }) + end, }) -- wrap and check for spell in text filetypes -vim.api.nvim_create_autocmd("FileType", { - group = augroup("wrap_spell"), - pattern = { "gitcommit", "markdown" }, - callback = function() - vim.opt_local.wrap = true - vim.opt_local.spell = true - end, +vim.api.nvim_create_autocmd('FileType', { + group = augroup('wrap_spell'), + pattern = { 'gitcommit', 'markdown' }, + callback = function() + vim.opt_local.wrap = true + vim.opt_local.spell = true + end, }) -- Auto create dir when saving a file, in case some intermediate directory does not exist -vim.api.nvim_create_autocmd({ "BufWritePre" }, { - group = augroup("auto_create_dir"), - callback = function(event) - local file = vim.loop.fs_realpath(event.match) or event.match - vim.fn.mkdir(vim.fn.fnamemodify(file, ":p:h"), "p") - end, +vim.api.nvim_create_autocmd({ 'BufWritePre' }, { + group = augroup('auto_create_dir'), + callback = function(event) + local file = vim.loop.fs_realpath(event.match) or event.match + vim.fn.mkdir(vim.fn.fnamemodify(file, ':p:h'), 'p') + end, }) -- Set arb filetype -vim.api.nvim_create_autocmd({ "BufEnter" }, { - group = augroup("set_file_type"), - pattern = { "*.arb" }, - command = require("lib.util").get_file_type_cmd("arb"), +vim.api.nvim_create_autocmd({ 'BufEnter' }, { + group = augroup('set_file_type'), + pattern = { '*.arb' }, + command = require('lib.util').get_file_type_cmd('arb'), }) -- Disable format options -vim.api.nvim_create_autocmd("FileType", { - group = augroup("disable_formatoptions"), - pattern = "*", - callback = function() - vim.opt_local.formatoptions:remove({ "c", "r", "o" }) - end, +vim.api.nvim_create_autocmd('FileType', { + group = augroup('disable_formatoptions'), + pattern = '*', + callback = function() + vim.opt_local.formatoptions:remove({ 'c', 'r', 'o' }) + end, }) local function enable_autoformat() - vim.api.nvim_create_autocmd({ "BufWritePre" }, { - group = augroup("autoformat"), - pattern = { "*" }, - callback = function() - vim.lsp.buf.format() - end, - }) + vim.api.nvim_create_autocmd({ 'BufWritePre' }, { + group = augroup('autoformat'), + pattern = { '*' }, + callback = function() + vim.lsp.buf.format() + end, + }) end enable_autoformat() -vim.api.nvim_create_user_command("WriteNoFormat", function() - -- Temporarily disable the autoformat autocmd - vim.api.nvim_del_augroup_by_name("keycodex_autoformat") - vim.cmd("write") - -- Re-enable the autoformat autocmd - enable_autoformat() +vim.api.nvim_create_user_command('WriteNoFormat', function() + -- Temporarily disable the autoformat autocmd + vim.api.nvim_del_augroup_by_name('keycodex_autoformat') + vim.cmd('write') + -- Re-enable the autoformat autocmd + enable_autoformat() end, {}) + +local autocmd = vim.api.nvim_create_autocmd +autocmd('Signal', { + pattern = 'SIGUSR1', + callback = function() + require('nvchad.utils').reload() + end, +}) diff --git a/lua/core/keys.lua b/lua/core/keys.lua index 2d6d935..043edaf 100644 --- a/lua/core/keys.lua +++ b/lua/core/keys.lua @@ -150,5 +150,11 @@ map('v', '{', 's{}Pll', { desc = 'wrap selection with curly braces' map('v', "'", "s''Pll", { desc = 'wrap selection with single quotes' }) map('v', '"', 's""Pll', { desc = 'wrap selection with double quotes' }) +-- Insert mode cursor movement with Ctrl+hjkl +map('i', '', '', { desc = 'Move cursor left' }) +map('i', '', '', { desc = 'Move cursor down' }) +map('i', '', '', { desc = 'Move cursor up' }) +map('i', '', '', { desc = 'Move cursor right' }) + diff --git a/lua/plugins/ai/avante.lua b/lua/plugins/ai/avante.lua index 9e9e5cd..8556343 100644 --- a/lua/plugins/ai/avante.lua +++ b/lua/plugins/ai/avante.lua @@ -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 = {}, }) diff --git a/lua/plugins/ai/mcphub.lua b/lua/plugins/ai/mcphub.lua index a41cafe..a047232 100644 --- a/lua/plugins/ai/mcphub.lua +++ b/lua/plugins/ai/mcphub.lua @@ -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', }, -}) \ No newline at end of file +}) diff --git a/lua/plugins/lazy.lua b/lua/plugins/lazy.lua index 29538c8..e9b2fe4 100644 --- a/lua/plugins/lazy.lua +++ b/lua/plugins/lazy.lua @@ -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 = { - ["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 = { + ['l'] = function(plugin) + require('lazy.util').float_term({ 'lazygit', 'log' }, { + cwd = plugin.dir, + }) + end, - ["t"] = function(plugin) - require("lazy.util").float_term(nil, { - cwd = plugin.dir, - }) - end, - }, - }, + ['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() diff --git a/lua/plugins/list.lua b/lua/plugins/list.lua index 60028d7..6dad476 100644 --- a/lua/plugins/list.lua +++ b/lua/plugins/list.lua @@ -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' }, { diff --git a/lua/plugins/lock.json b/lua/plugins/lock.json index f1979a1..0b1b218 100644 --- a/lua/plugins/lock.json +++ b/lua/plugins/lock.json @@ -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" } diff --git a/lua/plugins/ui/lualine.lua b/lua/plugins/ui/lualine.lua index 843950c..76340d5 100644 --- a/lua/plugins/ui/lualine.lua +++ b/lua/plugins/ui/lualine.lua @@ -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', }, diff --git a/lua/plugins/ui/onedark.lua b/lua/plugins/ui/onedark.lua deleted file mode 100644 index a475449..0000000 --- a/lua/plugins/ui/onedark.lua +++ /dev/null @@ -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 = '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() diff --git a/pywal/.gitignore b/pywal/.gitignore new file mode 100644 index 0000000..b0ac3ed --- /dev/null +++ b/pywal/.gitignore @@ -0,0 +1 @@ +.aider* diff --git a/pywal/LICENSE b/pywal/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/pywal/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/pywal/README.md b/pywal/README.md new file mode 100644 index 0000000..e0bc5ef --- /dev/null +++ b/pywal/README.md @@ -0,0 +1,71 @@ +

Base46: Pywal Edition

+ +

Pywal and Matugen support for NvChad!

+ +> [!NOTE] +> Support for Pywal requires these Python libraries to be installed: +> - `pywal` +> - `watchdog` + +## Installation +```bash +cd ~/.config/nvim +git clone https://github.com/NvChad/pywal +``` +Add this at the end of your `init.lua` file: +```lua +os.execute("python ~/.config/nvim/pywal/chadwal.py &> /dev/null &") + +local autocmd = vim.api.nvim_create_autocmd + +autocmd("Signal", { + pattern = "SIGUSR1", + callback = function() + require('nvchad.utils').reload() + end +}) +``` +Now you need to generate your Pywal theme again using `wal -i `. If not, `chadwal` will default to `gruvchad` colors. + +### Matugen support +Add this your `~/.config/matugen/config.toml` file: +```toml +[templates.nvim] +input_path = '~/.config/nvim/pywal/matugen.lua' +output_path = '~/.cache/wal/base46-dark.lua' + +[config.custom_colors.red] +color = "#FF0000" +blend = true + +[config.custom_colors.green] +color = "#00FF00" +blend = true + +[config.custom_colors.yellow] +color = "#FFFF00" +blend = true + +[config.custom_colors.blue] +color = "#0000FF" +blend = true + +[config.custom_colors.magenta] +color = "#FF00FF" +blend = true + +[config.custom_colors.cyan] +color = "#00FFFF" +blend = true + +[config.custom_colors.white] +color = "#FFFFFF" +blend = true +``` + +Just like with Pywal, you need to generate your theme again using `matugen image `. If not, `chadwal` will default to `gruvchad` colors. + +Select `chadwal` theme and enjoy! + +## Demo +https://github.com/user-attachments/assets/933c97f2-4566-406c-8c04-e2e9f0f3f6da diff --git a/pywal/chadwal.py b/pywal/chadwal.py new file mode 100644 index 0000000..c676271 --- /dev/null +++ b/pywal/chadwal.py @@ -0,0 +1,120 @@ +#!/usr/bin/env python3 + +import os +import shutil +import sys +import time +import subprocess +from watchdog.observers import Observer +from watchdog.events import FileSystemEventHandler + +# Constants +SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__)) +HOME_DIR = os.path.expanduser("~") +TEMPLATE_SRC = { + "dark": os.path.join(SCRIPT_DIR, "dark.lua"), + "light": os.path.join(SCRIPT_DIR, "light.lua") +} +TEMPLATE_DST = { + "dark": f"{HOME_DIR}/.config/wal/templates/base46-dark.lua", + "light": f"{HOME_DIR}/.config/wal/templates/base46-light.lua" +} +CACHE_SRC = { + "dark": f"{HOME_DIR}/.cache/wal/base46-dark.lua", + "light": f"{HOME_DIR}/.cache/wal/base46-light.lua" +} +CACHE_DST = f"{HOME_DIR}/.local/share/nvim/lazy/base46/lua/base46/themes/chadwal.lua" +FALLBACK_THEME = f"{HOME_DIR}/.local/share/nvim/lazy/base46/lua/base46/themes/gruvchad.lua" +LOCK_FILE = "/tmp/wal_nvim_lock" +COLORS_FILE = f"{HOME_DIR}/.cache/wal/colors" + +# Utility functions +def is_dark(hex_color): + """Determine if the color is dark based on luminance.""" + hex_color = hex_color.lstrip('#') + r, g, b = (int(hex_color[i:i+2], 16) for i in (0, 2, 4)) + brightness = (r * 299 + g * 587 + b * 114) / 1000 + return brightness < 128 + +def get_hex_from_colors_file(): + """Read the first color from the colors file.""" + try: + with open(COLORS_FILE, 'r') as file: + return file.readline().strip() + except FileNotFoundError: + sys.exit(f"Error: Colors file not found: {COLORS_FILE}") + +def acquire_lock(): + """Create a lock file to prevent multiple instances.""" + if os.path.exists(LOCK_FILE): + sys.exit("Another instance is already running. Exiting...") + open(LOCK_FILE, 'w').close() + +def release_lock(): + """Remove the lock file.""" + if os.path.exists(LOCK_FILE): + os.remove(LOCK_FILE) + +def copy_file(src, dst, skip_if_exists=False): + """Copy a file from src to dst, optionally skipping if dst exists.""" + if skip_if_exists and os.path.exists(dst): + print(f"File already exists at {dst}, skipping copy.") + return + + try: + os.makedirs(os.path.dirname(dst), exist_ok=True) + shutil.copy(src, dst) + print(f"File copied from {src} to {dst}.") + except Exception as e: + sys.exit(f"Error copying file from {src} to {dst}: {e}") + +def on_file_modified(): + """Handle file modifications based on current color scheme.""" + is_dark_theme = is_dark(get_hex_from_colors_file()) + mode = "dark" if is_dark_theme else "light" + + copy_file(FALLBACK_THEME, CACHE_SRC[mode], skip_if_exists=True) + copy_file(TEMPLATE_SRC[mode], TEMPLATE_DST[mode]) + copy_file(CACHE_SRC[mode], CACHE_DST) + + # Signal running nvim instances, don't exit based on the result here. + subprocess.run(['killall', '-SIGUSR1', 'nvim']) + +# Watchdog event handler +class MyHandler(FileSystemEventHandler): + def on_modified(self, event): + if event.src_path == CACHE_SRC["dark"]: + on_file_modified() + +def monitor_file(file_path): + """Monitor the specified file for changes.""" + event_handler = MyHandler() + observer = Observer() + observer.schedule(event_handler, os.path.dirname(file_path), recursive=False) + observer.start() + + try: + while True: + # Check every 5 seconds if nvim is running + time.sleep(5) + # Use pgrep to check for exact process name 'nvim' + result = subprocess.run(['pgrep', '-x', 'nvim'], capture_output=True) + if result.returncode != 0: + print("No running nvim instances found. Exiting.") + observer.stop() # Stop the observer thread + break # Exit the loop + except KeyboardInterrupt: + print("\nKeyboard interrupt received. Exiting.") + observer.stop() + finally: + # Ensure the observer thread is joined before exiting + observer.join() + +if __name__ == "__main__": + on_file_modified() + acquire_lock() + try: + on_file_modified() + monitor_file(CACHE_SRC["dark"]) + finally: + release_lock() diff --git a/pywal/dark.lua b/pywal/dark.lua new file mode 100644 index 0000000..7837144 --- /dev/null +++ b/pywal/dark.lua @@ -0,0 +1,70 @@ +local M = {{}} + +local lighten = require("base46.colors").change_hex_lightness + +M.base_30 = {{ + white = "{color7}", + darker_black = lighten("{color0}", -3), + black = "{color0}", + black2 = lighten("{color0}", 6), + one_bg = lighten("{color0}", 10), + grey = lighten("{color0}", 40), + light_grey = "{color8}", + red = "{color1}", + baby_pink = "{color9}", + pink = "{color13}", + line = "{color8}", + green = "{color2}", + vibrant_green = "{color2}", + nord_blue = "{color4}", + blue = "{color4}", + yellow = "{color3}", + sun = lighten("{color3}", 6), + purple = "{color13}", + dark_purple = "{color13}", + teal = "{color4}", + orange = "{color1}", + cyan = "{color4}", + pmenu_bg = "{color8}", + folder_bg = "{color4}", +}} + +M.base_30.statusline_bg = M.base_30.black2 +M.base_30.lightbg = M.base_30.one_bg +M.base_30.one_bg2 = lighten(M.base_30.one_bg, 6) +M.base_30.one_bg3 = lighten(M.base_30.one_bg2, 6) +M.base_30.grey_fg = lighten(M.base_30.grey, 10) +M.base_30.grey_fg2 = lighten(M.base_30.grey, 5) + +M.base_16 = {{ + base00 = "{color0}", + base01 = "{color0}", + base02 = "{color8}", + base03 = "{color8}", + base04 = "{color7}", + base05 = "{color7}", + base06 = "{color15}", + base07 = "{color15}", + base08 = "{color1}", + base09 = "{color2}", + base0A = "{color3}", + base0B = "{color4}", + base0C = "{color5}", + base0D = "{color6}", + base0E = "{color1}", + base0F = "{color15}", +}} + +M.type = "dark" + +M.polish_hl = {{ + Operator = {{ + fg = M.base_30.nord_blue, + }}, + + ["@operator"] = {{ + fg = M.base_30.nord_blue, + }}, +}} + +return M diff --git a/pywal/light.lua b/pywal/light.lua new file mode 100644 index 0000000..3cb85a4 --- /dev/null +++ b/pywal/light.lua @@ -0,0 +1,70 @@ +local M = {{}} + +local lighten = require("base46.colors").change_hex_lightness + +M.base_30 = {{ + white = "{color7}", + darker_black = lighten("{color0}", -3), + black = "{color0}", + black2 = lighten("{color0}", -6), + one_bg = lighten("{color0}", -10), + grey = lighten("{color0}", -40), + light_grey = "{color8}", + red = "{color1}", + baby_pink = "{color9}", + pink = "{color13}", + line = "{color8}", + green = "{color2}", + vibrant_green = "{color2}", + nord_blue = "{color4}", + blue = "{color4}", + yellow = "{color3}", + sun = lighten("{color3}", -6), + purple = "{color13}", + dark_purple = "{color13}", + teal = "{color4}", + orange = "{color1}", + cyan = "{color4}", + pmenu_bg = "{color8}", + folder_bg = "{color4}", + }} + + M.base_30.statusline_bg = M.base_30.black2 + M.base_30.lightbg = M.base_30.one_bg + M.base_30.one_bg2 = lighten(M.base_30.one_bg, -6) + M.base_30.one_bg3 = lighten(M.base_30.one_bg2, -6) + M.base_30.grey_fg = lighten(M.base_30.grey, -10) + M.base_30.grey_fg2 = lighten(M.base_30.grey, -5) + +M.base_16 = {{ + base00 = "{color0}", + base01 = "{color0}", + base02 = "{color8}", + base03 = "{color8}", + base04 = "{color7}", + base05 = "{color7}", + base06 = "{color15}", + base07 = "{color15}", + base08 = "{color1}", + base09 = "{color2}", + base0A = "{color3}", + base0B = "{color4}", + base0C = "{color5}", + base0D = "{color6}", + base0E = "{color1}", + base0F = "{color15}", +}} + +M.type = "dark" + +M.polish_hl = {{ + Operator = {{ + fg = M.base_30.nord_blue, + }}, + + ["@operator"] = {{ + fg = M.base_30.nord_blue, + }}, +}} + +return M diff --git a/pywal/matugen.lua b/pywal/matugen.lua new file mode 100644 index 0000000..8755c2d --- /dev/null +++ b/pywal/matugen.lua @@ -0,0 +1,81 @@ +local M = {} + +local lighten = require("base46.colors").change_hex_lightness + +M.base_30 = { + white = "{{colors.on_background.default.hex}}", + black = "{{colors.background.default.hex}}", + darker_black = lighten("{{colors.background.default.hex}}", -3), + black2 = lighten("{{colors.background.default.hex}}", 6), + one_bg = lighten("{{colors.background.default.hex}}", 10), + one_bg2 = lighten("{{colors.background.default.hex}}", 16), + one_bg3 = lighten("{{colors.background.default.hex}}", 22), + grey = "{{colors.surface_variant.default.hex}}", + grey_fg = lighten("{{colors.surface_variant.default.hex}}", -10), + grey_fg2 = lighten("{{colors.surface_variant.default.hex}}", -20), + light_grey = "{{colors.outline.default.hex}}", + red = "{{colors.red.default.hex}}", + baby_pink = lighten("{{colors.red.default.hex}}", 10), + pink = "{{colors.tertiary.default.hex}}", + line = "{{colors.outline.default.hex}}", + green = "{{colors.green.default.hex}}", + vibrant_green = lighten("{{colors.green.default.hex}}", 10), + blue = "{{colors.blue.default.hex}}", + nord_blue = lighten("{{colors.blue.default.hex}}", 10), + yellow = "{{colors.yellow.default.hex}}", + sun = lighten("{{colors.yellow.default.hex}}", 10), + purple = "{{colors.tertiary.default.hex}}", + dark_purple = lighten("{{colors.tertiary.default.hex}}", -10), + teal = "{{colors.secondary_container.default.hex}}", + orange = "{{colors.red.default.hex}}", + cyan = "{{colors.cyan.default.hex}}", + statusline_bg = lighten("{{colors.background.default.hex}}", 6), + pmenu_bg = "{{colors.surface_variant.default.hex}}", + folder_bg = lighten("{{colors.primary_fixed_dim.default.hex}}", 0), + lightbg = lighten("{{colors.background.default.hex}}", 10), +} + +M.base_16 = { + base00 = "{{colors.surface.default.hex}}", + base01 = lighten("{{colors.surface_variant.default.hex}}", 0), + base02 = lighten("{{colors.surface_variant.default.hex}}", 3), + base03 = lighten("{{colors.outline.default.hex}}", 0), + base04 = lighten("{{colors.on_surface_variant.default.hex}}", 0), + base05 = "{{colors.on_surface.default.hex}}", + base06 = lighten("{{colors.on_surface.default.hex}}", 0), + base07 = "{{colors.surface.default.hex}}", + base08 = "{{colors.red.default.hex}}", + base09 = "{{colors.yellow.default.hex}}", + base0A = "{{colors.blue.default.hex}}", + base0B = "{{colors.green.default.hex}}", + base0C = "{{colors.cyan.default.hex}}", + base0D = lighten("{{colors.blue.default.hex}}", 20), + base0E = "{{colors.tertiary.default.hex}}", + base0F = "{{colors.inverse_surface.default.hex}}", +} + +M.type = "dark" + +M.polish_hl = { + defaults = { + Comment = { + italic = true, + fg = M.base_16.base03, + }, + }, + Syntax = { + String = { + fg = "{{colors.tertiary.default.hex}}", + }, + }, + treesitter = { + ["@comment"] = { + fg = M.base_16.base03, + }, + ["@string"] = { + fg = "{{colors.tertiary.default.hex}}", + }, + }, +} + +return M