From e4e014b05f6466c6cc76c5b0dae9e28d26a7889f Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Sun, 19 May 2024 13:13:06 +0700 Subject: [PATCH] add: update config --- lazy-lock.json | 2 +- lua/custom/default.lua | 2 +- lua/custom/plugins/lualine_backup.lua | 575 ++++++++++++------------- lua/custom/plugins/lualine_onedark.lua | 492 ++++++++++----------- lua/custom/plugins/onedarkpro.lua | 224 +++++----- lua/plugins/colorscheme.lua | 3 +- lua/user/whichkey.lua | 2 +- 7 files changed, 650 insertions(+), 650 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 14a641c..fd86e3f 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -10,6 +10,7 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "code_runner.nvim": { "branch": "main", "commit": "d135c4178bf8980ca5fa4aa6e27ab9ee4373c875" }, "codeium.vim": { "branch": "main", "commit": "9406f13cf3eaa08318b76746bd105a04506cab27" }, + "dracula.nvim": { "branch": "main", "commit": "8d8bddb8814c3e7e62d80dda65a9876f97eb699c" }, "dressing.nvim": { "branch": "master", "commit": "572314728cb1ce012e825fd66331f52c94acac12" }, "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" }, "gitsigns.nvim": { "branch": "main", "commit": "76927d14d3fbd4ba06ccb5246e79d93b5442c188" }, @@ -42,7 +43,6 @@ "nvim-ts-context-commentstring": { "branch": "main", "commit": "0bdccb9c67a42a5e2d99384dc9bfa29b1451528f" }, "nvim-ufo": { "branch": "main", "commit": "a5390706f510d39951dd581f6d2a972741b3fa26" }, "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, - "onedarkpro.nvim": { "branch": "main", "commit": "ec07364f3cfa9cc6467bf067a490cfd74011efcd" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, "smart-splits.nvim": { "branch": "master", "commit": "2179ec0d26aacd4f40c766c79f6ebc83b7001e48" }, diff --git a/lua/custom/default.lua b/lua/custom/default.lua index d8750a6..96bc9f0 100644 --- a/lua/custom/default.lua +++ b/lua/custom/default.lua @@ -11,7 +11,7 @@ -- catppuccin, catppuccin-latte, catppuccin-frappe, catppuccin-macchiato, catppuccin-mocha -- dracula -- nightfox, dayfox, dawnfox, duskfox, nordfox, terafox, carbonfox -vim.g.pcode_colorscheme = "onedark" +vim.g.pcode_colorscheme = "dracula" -- custom transparent mode -- only support diff --git a/lua/custom/plugins/lualine_backup.lua b/lua/custom/plugins/lualine_backup.lua index 277d956..869aa3c 100644 --- a/lua/custom/plugins/lualine_backup.lua +++ b/lua/custom/plugins/lualine_backup.lua @@ -1,290 +1,289 @@ return { - -- { - -- "nvim-lualine/lualine.nvim", - -- event = "InsertEnter", - -- config = function() - -- local hide_in_width = function() - -- return vim.fn.winwidth(0) > 80 - -- end - -- local icons = require("user.icons") - -- - -- local getLeftSubstring = function(word, length) - -- if #word > length then - -- return string.sub(word, 1, length) .. "..." - -- else - -- return word - -- end - -- end - -- - -- -- start for lsp - -- local list_registered_providers_names = function(filetype) - -- local s = require("null-ls.sources") - -- local available_sources = s.get_available(filetype) - -- local registered = {} - -- for _, source in ipairs(available_sources) do - -- for method in pairs(source.methods) do - -- registered[method] = registered[method] or {} - -- table.insert(registered[method], source.name) - -- end - -- end - -- return registered - -- end - -- - -- local null_ls = require("null-ls") - -- -- for formatter - -- local list_registered = function(filetype) - -- local method = null_ls.methods.FORMATTING - -- local registered_providers = list_registered_providers_names(filetype) - -- return registered_providers[method] or {} - -- end - -- - -- --- for linter - -- local alternative_methods = { - -- null_ls.methods.DIAGNOSTICS, - -- null_ls.methods.DIAGNOSTICS_ON_OPEN, - -- null_ls.methods.DIAGNOSTICS_ON_SAVE, - -- } - -- - -- local linter_list_registered = function(filetype) - -- local registered_providers = list_registered_providers_names(filetype) - -- local providers_for_methods = vim.tbl_flatten(vim.tbl_map(function(m) - -- return registered_providers[m] or {} - -- end, alternative_methods)) - -- - -- return providers_for_methods - -- end - -- -- end for lsp - -- - -- local lsp_info = { - -- function() - -- local msg = "LS Inactive" - -- local buf_ft = vim.bo.filetype - -- local clients = vim.lsp.get_active_clients() - -- -- start register - -- local buf_clients = vim.lsp.buf_get_clients() - -- local buf_client_names = {} - -- if next(buf_clients) == nil then - -- -- TODO: clean up this if statement - -- if type(msg) == "boolean" or #msg == 0 then - -- return "LS Inactive" - -- end - -- return msg - -- end - -- -- add client - -- for _, client in pairs(buf_clients) do - -- if client.name ~= "null-ls" and client.name ~= "copilot" then - -- table.insert(buf_client_names, client.name) - -- end - -- end - -- -- add formatter - -- local supported_formatters = list_registered(buf_ft) - -- vim.list_extend(buf_client_names, supported_formatters) - -- -- add linter - -- local supported_linters = linter_list_registered(buf_ft) - -- vim.list_extend(buf_client_names, supported_linters) - -- -- decomple - -- local unique_client_names = vim.fn.uniq(buf_client_names) - -- local msg = table.concat(unique_client_names, ", ") - -- return msg - -- end, - -- --icon = " ", - -- icon = icons.ui.Gear .. "", - -- padding = 1, - -- } - -- - -- local diagnostics = { - -- "diagnostics", - -- sources = { "nvim_diagnostic" }, - -- sections = { "error", "warn" }, - -- -- symbols = { error = " ", warn = " " }, - -- symbols = { - -- error = icons.diagnostics.BoldError .. " ", - -- warn = icons.diagnostics.BoldWarning .. " ", - -- }, - -- colored = true, - -- update_in_insert = false, - -- always_visible = false, - -- } - -- - -- local diff = { - -- "diff", - -- colored = true, - -- -- symbols = { added = " ", modified = " ", removed = " " }, -- changes diff symbols - -- symbols = { - -- added = icons.git.LineAdded .. " ", - -- modified = icons.git.LineModified .. " ", - -- removed = icons.git.LineRemoved .. " ", - -- }, -- changes diff symbols - -- cond = hide_in_width, - -- } - -- - -- local spaces = function() - -- -- return " " .. vim.api.nvim_buf_get_option(0, "shiftwidth") - -- return icons.ui.Tab .. " " .. vim.api.nvim_buf_get_option(0, "shiftwidth") - -- end - -- - -- local mode = { - -- "mode", - -- padding = 1, - -- separator = { left = " " }, - -- -- right_padding = 3, - -- fmt = function(str) - -- return icons.ui.Neovim .. " " .. str - -- end, - -- } - -- local branch = { - -- "branch", - -- padding = 1, - -- } - -- - -- local get_branch = function() - -- if vim.b.gitsigns_head ~= nil then - -- return icons.git.Branch2 .. " " .. getLeftSubstring(vim.b.gitsigns_head, 6) - -- else - -- return icons.git.Branch2 .. vim.fn.fnamemodify("", ":t") - -- end - -- end - -- - -- local lsp_progress = {} - -- local data_ok, lspprogress = pcall(require, "lsp-progress") - -- if data_ok then - -- lsp_progress = lspprogress.progress - -- end - -- -- stylua: ignore - -- local colors = { - -- blue = '#50fa7b', - -- cyan = '#f1fa8c', - -- black = '#1a1b26', - -- black_transparant = 'none', - -- white = '#c6c6c6', - -- red = "#ff757f", - -- skyblue_1 = '#bd93f9', - -- grey = '#5f6a8e', - -- yellow = "#ffb86c", - -- fg_gutter = "#3b4261", - -- green1 = "#bd93f9", - -- } - -- - -- -- check config for theme - -- local set_theme - -- local bubbles_theme = {} - -- local data_exists, config = pcall(require, "core.config") - -- if data_exists then - -- if config.colorscheme ~= nil then - -- local color = config.colorscheme - -- switch(color, { - -- ["tokyonight"] = function() - -- set_theme = "auto" - -- end, - -- ["tokyonight-night"] = function() - -- set_theme = "auto" - -- end, - -- ["tokyonight-storm"] = function() - -- set_theme = "auto" - -- end, - -- ["tokyonight-day"] = function() - -- set_theme = "auto" - -- end, - -- ["tokyonight-moon"] = function() - -- set_theme = "auto" - -- end, - -- ["dracula"] = function() - -- local clr = require("dracula").colors() - -- colors.blue = clr.green - -- colors.black = clr.black - -- colors.cyan = clr.yellow - -- set_theme = bubbles_theme - -- end, - -- default = function() - -- set_theme = "auto" - -- end, - -- }) - -- end - -- end - -- - -- bubbles_theme = { - -- normal = { - -- a = { fg = colors.black, bg = colors.skyblue_1 }, - -- b = { fg = colors.white, bg = colors.grey }, - -- c = { fg = colors.white, bg = colors.black_transparant }, - -- }, - -- - -- insert = { - -- a = { fg = colors.black, bg = colors.blue }, - -- b = { fg = colors.blue, bg = colors.grey }, - -- }, - -- visual = { - -- a = { fg = colors.black, bg = colors.cyan }, - -- b = { fg = colors.cyan, bg = colors.grey }, - -- }, - -- replace = { - -- a = { bg = colors.red, fg = colors.black }, - -- b = { bg = colors.fg_gutter, fg = colors.red }, - -- }, - -- command = { - -- a = { bg = colors.yellow, fg = colors.black }, - -- b = { bg = colors.fg_gutter, fg = colors.yellow }, - -- }, - -- terminal = { - -- a = { bg = colors.green1, fg = colors.black }, - -- b = { bg = colors.fg_gutter, fg = colors.green1 }, - -- }, - -- inactive = { - -- a = { fg = colors.white, bg = colors.black_transparant }, - -- b = { fg = colors.white, bg = colors.black_transparant }, - -- c = { fg = colors.black, bg = colors.black_transparant }, - -- }, - -- } - -- - -- if set_theme == "auto" then - -- bubbles_theme = vim.fn.fnamemodify("auto", ":t") - -- end - -- - -- require("lualine").setup({ - -- options = { - -- theme = bubbles_theme, - -- -- theme = "auto", - -- component_separators = { left = "", right = "" }, - -- section_separators = { left = "", right = "" }, - -- disabled_filetypes = { - -- "TelescopePrompt", - -- "packer", - -- "alpha", - -- "dashboard", - -- "NvimTree", - -- "Outline", - -- "DressingInput", - -- "toggleterm", - -- "lazy", - -- "mason", - -- "neo-tree", - -- "startuptime", - -- }, - -- always_divide_middle = true, - -- }, - -- sections = { - -- lualine_a = { - -- mode, - -- }, - -- lualine_b = { get_branch }, - -- lualine_c = { lsp_info, diagnostics, lsp_progress }, - -- lualine_x = { diff, spaces, "filetype" }, - -- lualine_y = { "progress" }, - -- lualine_z = { - -- { "location", separator = { right = " " }, padding = 1 }, - -- }, - -- }, - -- inactive_sections = { - -- lualine_a = { "filename" }, - -- lualine_b = {}, - -- lualine_c = {}, - -- lualine_x = {}, - -- lualine_y = {}, - -- lualine_z = { "location" }, - -- }, - -- tabline = {}, - -- extensions = {}, - -- }) - -- end, - -- }, + { + "nvim-lualine/lualine.nvim", + event = "InsertEnter", + config = function() + local hide_in_width = function() + return vim.fn.winwidth(0) > 80 + end + local icons = require("user.icons") + + local getLeftSubstring = function(word, length) + if #word > length then + return string.sub(word, 1, length) .. "..." + else + return word + end + end + + -- start for lsp + local list_registered_providers_names = function(filetype) + local s = require("null-ls.sources") + local available_sources = s.get_available(filetype) + local registered = {} + for _, source in ipairs(available_sources) do + for method in pairs(source.methods) do + registered[method] = registered[method] or {} + table.insert(registered[method], source.name) + end + end + return registered + end + + local null_ls = require("null-ls") + -- for formatter + local list_registered = function(filetype) + local method = null_ls.methods.FORMATTING + local registered_providers = list_registered_providers_names(filetype) + return registered_providers[method] or {} + end + + --- for linter + local alternative_methods = { + null_ls.methods.DIAGNOSTICS, + null_ls.methods.DIAGNOSTICS_ON_OPEN, + null_ls.methods.DIAGNOSTICS_ON_SAVE, + } + + local linter_list_registered = function(filetype) + local registered_providers = list_registered_providers_names(filetype) + local providers_for_methods = vim.iter(vim.tbl_map(function(m) + return registered_providers[m] or {} + end, alternative_methods)) + + return providers_for_methods + end + -- end for lsp + + local lsp_info = { + function() + local msg = "LS Inactive" + local buf_ft = vim.bo.filetype + -- start register + local buf_clients = vim.lsp.get_clients() + local buf_client_names = {} + if next(buf_clients) == nil then + -- TODO: clean up this if statement + if type(msg) == "boolean" or #msg == 0 then + return "LS Inactive" + end + return msg + end + -- add client + for _, client in pairs(buf_clients) do + if client.name ~= "null-ls" and client.name ~= "copilot" then + table.insert(buf_client_names, client.name) + end + end + -- add formatter + local supported_formatters = list_registered(buf_ft) + vim.list_extend(buf_client_names, supported_formatters) + -- add linter + local supported_linters = linter_list_registered(buf_ft) + vim.list_extend(buf_client_names, supported_linters) + -- decomple + local unique_client_names = vim.fn.uniq(buf_client_names) + local msg = table.concat(unique_client_names, ", ") + return msg + end, + --icon = " ", + icon = icons.ui.Gear .. "", + padding = 1, + } + + local diagnostics = { + "diagnostics", + sources = { "nvim_diagnostic" }, + sections = { "error", "warn" }, + -- symbols = { error = " ", warn = " " }, + symbols = { + error = icons.diagnostics.BoldError .. " ", + warn = icons.diagnostics.BoldWarning .. " ", + }, + colored = true, + update_in_insert = false, + always_visible = false, + } + + local diff = { + "diff", + colored = true, + -- symbols = { added = " ", modified = " ", removed = " " }, -- changes diff symbols + symbols = { + added = icons.git.LineAdded .. " ", + modified = icons.git.LineModified .. " ", + removed = icons.git.LineRemoved .. " ", + }, -- changes diff symbols + cond = hide_in_width, + } + + local spaces = function() + -- return " " .. vim.api.nvim_buf_get_option(0, "shiftwidth") + return icons.ui.Tab .. " " .. vim.api.nvim_get_option_value(0, "shiftwidth") + end + + local mode = { + "mode", + padding = 1, + separator = { left = " " }, + -- right_padding = 3, + fmt = function(str) + return icons.ui.Neovim .. " " .. str + end, + } + local branch = { + "branch", + padding = 1, + } + + local get_branch = function() + if vim.b.gitsigns_head ~= nil then + return icons.git.Branch2 .. " " .. getLeftSubstring(vim.b.gitsigns_head, 6) + else + return icons.git.Branch2 .. vim.fn.fnamemodify("", ":t") + end + end + + local lsp_progress = {} + local data_ok, lspprogress = pcall(require, "lsp-progress") + if data_ok then + lsp_progress = lspprogress.progress + end + -- stylua: ignore + local colors = { + blue = '#50fa7b', + cyan = '#f1fa8c', + black = '#1a1b26', + black_transparant = 'none', + white = '#c6c6c6', + red = "#ff757f", + skyblue_1 = '#bd93f9', + grey = '#5f6a8e', + yellow = "#ffb86c", + fg_gutter = "#3b4261", + green1 = "#bd93f9", + } + + -- check config for theme + local set_theme + local bubbles_theme = {} + local data_exists, config = pcall(require, "core.config") + if data_exists then + if config.colorscheme ~= nil then + local color = config.colorscheme + switch(color, { + ["tokyonight"] = function() + set_theme = "auto" + end, + ["tokyonight-night"] = function() + set_theme = "auto" + end, + ["tokyonight-storm"] = function() + set_theme = "auto" + end, + ["tokyonight-day"] = function() + set_theme = "auto" + end, + ["tokyonight-moon"] = function() + set_theme = "auto" + end, + ["dracula"] = function() + local clr = require("dracula").colors() + colors.blue = clr.green + colors.black = clr.black + colors.cyan = clr.yellow + set_theme = bubbles_theme + end, + default = function() + set_theme = "auto" + end, + }) + end + end + + bubbles_theme = { + normal = { + a = { fg = colors.black, bg = colors.skyblue_1 }, + b = { fg = colors.white, bg = colors.grey }, + c = { fg = colors.white, bg = colors.black_transparant }, + }, + + insert = { + a = { fg = colors.black, bg = colors.blue }, + b = { fg = colors.blue, bg = colors.grey }, + }, + visual = { + a = { fg = colors.black, bg = colors.cyan }, + b = { fg = colors.cyan, bg = colors.grey }, + }, + replace = { + a = { bg = colors.red, fg = colors.black }, + b = { bg = colors.fg_gutter, fg = colors.red }, + }, + command = { + a = { bg = colors.yellow, fg = colors.black }, + b = { bg = colors.fg_gutter, fg = colors.yellow }, + }, + terminal = { + a = { bg = colors.green1, fg = colors.black }, + b = { bg = colors.fg_gutter, fg = colors.green1 }, + }, + inactive = { + a = { fg = colors.white, bg = colors.black_transparant }, + b = { fg = colors.white, bg = colors.black_transparant }, + c = { fg = colors.black, bg = colors.black_transparant }, + }, + } + + if set_theme == "auto" then + bubbles_theme = vim.fn.fnamemodify("auto", ":t") + end + + require("lualine").setup({ + options = { + theme = bubbles_theme, + -- theme = "auto", + component_separators = { left = "", right = "" }, + section_separators = { left = "", right = "" }, + disabled_filetypes = { + "TelescopePrompt", + "packer", + "alpha", + "dashboard", + "NvimTree", + "Outline", + "DressingInput", + "toggleterm", + "lazy", + "mason", + "neo-tree", + "startuptime", + }, + always_divide_middle = true, + }, + sections = { + lualine_a = { + mode, + }, + lualine_b = { get_branch }, + lualine_c = { lsp_info, diagnostics, lsp_progress }, + lualine_x = { diff, spaces, "filetype" }, + lualine_y = { "progress" }, + lualine_z = { + { "location", separator = { right = " " }, padding = 1 }, + }, + }, + inactive_sections = { + lualine_a = { "filename" }, + lualine_b = {}, + lualine_c = {}, + lualine_x = {}, + lualine_y = {}, + lualine_z = { "location" }, + }, + tabline = {}, + extensions = {}, + }) + end, + }, } diff --git a/lua/custom/plugins/lualine_onedark.lua b/lua/custom/plugins/lualine_onedark.lua index 2354a7d..a040416 100644 --- a/lua/custom/plugins/lualine_onedark.lua +++ b/lua/custom/plugins/lualine_onedark.lua @@ -1,248 +1,248 @@ return { - { - "nvim-lualine/lualine.nvim", - event = "InsertEnter", - config = function() - local hide_in_width = function() - return vim.fn.winwidth(0) > 80 - end - local icons = require("user.icons") - - local getLeftSubstring = function(word, length) - if #word > length then - return string.sub(word, 1, length) .. "..." - else - return word - end - end - - -- start for lsp - local list_registered_providers_names = function(filetype) - local s = require("null-ls.sources") - local available_sources = s.get_available(filetype) - local registered = {} - for _, source in ipairs(available_sources) do - for method in pairs(source.methods) do - registered[method] = registered[method] or {} - table.insert(registered[method], source.name) - end - end - return registered - end - - local null_ls = require("null-ls") - -- for formatter - local list_registered = function(filetype) - local method = null_ls.methods.FORMATTING - local registered_providers = list_registered_providers_names(filetype) - return registered_providers[method] or {} - end - - --- for linter - local alternative_methods = { - null_ls.methods.DIAGNOSTICS, - null_ls.methods.DIAGNOSTICS_ON_OPEN, - null_ls.methods.DIAGNOSTICS_ON_SAVE, - } - - local linter_list_registered = function(filetype) - local registered_providers = list_registered_providers_names(filetype) - local providers_for_methods = vim.iter(vim.tbl_map(function(m) - return registered_providers[m] or {} - end, alternative_methods)) - - return providers_for_methods - end - -- end for lsp - - local lsp_info = { - function() - local msg = "LS Inactive" - local buf_ft = vim.bo.filetype - -- start register - local buf_clients = vim.lsp.get_clients() - local buf_client_names = {} - if next(buf_clients) == nil then - -- TODO: clean up this if statement - if type(msg) == "boolean" or #msg == 0 then - return "LS Inactive" - end - return msg - end - -- add client - for _, client in pairs(buf_clients) do - if client.name ~= "null-ls" and client.name ~= "copilot" then - table.insert(buf_client_names, client.name) - end - end - -- add formatter - local supported_formatters = list_registered(buf_ft) - vim.list_extend(buf_client_names, supported_formatters) - -- add linter - local supported_linters = linter_list_registered(buf_ft) - vim.list_extend(buf_client_names, supported_linters) - -- decomple - local unique_client_names = vim.fn.uniq(buf_client_names) - local msg = table.concat(unique_client_names, ", ") - return msg - end, - --icon = " ", - icon = icons.ui.Gear .. "", - padding = 1, - } - - local diagnostics = { - "diagnostics", - sources = { "nvim_diagnostic" }, - sections = { "error", "warn" }, - -- symbols = { error = " ", warn = " " }, - symbols = { - error = icons.diagnostics.BoldError .. " ", - warn = icons.diagnostics.BoldWarning .. " ", - }, - colored = true, - update_in_insert = false, - always_visible = false, - } - - local diff = { - "diff", - colored = true, - -- symbols = { added = " ", modified = " ", removed = " " }, -- changes diff symbols - symbols = { - added = icons.git.LineAdded .. " ", - modified = icons.git.LineModified .. " ", - removed = icons.git.LineRemoved .. " ", - }, -- changes diff symbols - cond = hide_in_width, - } - - local spaces = function() - -- return " " .. vim.api.nvim_buf_get_option(0, "shiftwidth") - return icons.ui.Tab .. " " .. vim.api.nvim_get_option_value(0, "shiftwidth") - end - - local mode = { - "mode", - padding = 1, - separator = { left = " " }, - -- right_padding = 3, - fmt = function(str) - return icons.ui.Neovim .. " " .. str - end, - } - local branch = { - "branch", - padding = 1, - } - - local get_branch = function() - if vim.b.gitsigns_head ~= nil then - return icons.git.Branch2 .. " " .. getLeftSubstring(vim.b.gitsigns_head, 6) - else - return icons.git.Branch2 .. vim.fn.fnamemodify("", ":t") - end - end - - local lsp_progress = {} - local data_ok, lspprogress = pcall(require, "lsp-progress") - if data_ok then - lsp_progress = lspprogress.progress - end - -- stylua: ignore - -- local onedark=vim.fn.fnamemodify("auto", ":t") - local onedark={} - local is_transparat = true - local status_ok, onedarkpro = pcall(require, "onedarkpro.helpers") - if status_ok then - local colors = onedarkpro.get_colors("onedark") - - onedark = { - normal = { - a = { bg = colors.green, fg = colors.bg }, - b = { bg = colors.fg_gutter, fg = colors.green }, - c = { - bg = is_transparat and colors.none or colors.bg_statusline, - fg = colors.fg, - }, - }, - - insert = { - a = { bg = colors.blue, fg = colors.bg }, - b = { bg = colors.fg_gutter, fg = colors.blue }, - }, - visual = { - a = { bg = colors.yellow, fg = colors.bg }, - b = { bg = colors.fg_gutter, fg = colors.yellow }, - }, - replace = { - a = { bg = colors.red, fg = colors.bg }, - b = { bg = colors.fg_gutter, fg = colors.red }, - }, - command = { - a = { bg = colors.purple, fg = colors.bg }, - b = { bg = colors.fg_gutter, fg = colors.purple }, - }, - terminal = { - a = { bg = colors.cyan, fg = colors.bg }, - b = { bg = colors.fg_gutter, fg = colors.cyan }, - }, - inactive = { - a = { bg = colors.bg, fg = colors.blue }, - b = { bg = colors.bg, fg = colors.fg_gutter_inactive, gui = "bold" }, - c = { - bg = is_transparat and colors.none or colors.bg, - fg = colors.fg_gutter_inactive, - }, - }, - } - end - - require("lualine").setup({ - options = { - theme = onedark, - -- theme = "auto", - component_separators = { left = "", right = "" }, - section_separators = { left = "", right = "" }, - disabled_filetypes = { - "TelescopePrompt", - "packer", - "alpha", - "dashboard", - "NvimTree", - "Outline", - "DressingInput", - "toggleterm", - "lazy", - "mason", - "neo-tree", - "startuptime", - }, - always_divide_middle = true, - }, - sections = { - lualine_a = { - mode, - }, - lualine_b = { get_branch }, - lualine_c = { lsp_info, diagnostics, lsp_progress }, - lualine_x = { diff, spaces, "filetype" }, - lualine_y = { "progress" }, - lualine_z = { - { "location", separator = { right = " " }, padding = 1 }, - }, - }, - inactive_sections = { - lualine_a = { "filename" }, - lualine_b = {}, - lualine_c = {}, - lualine_x = {}, - lualine_y = {}, - lualine_z = { "location" }, - }, - tabline = {}, - extensions = {}, - }) - end, - }, + -- { + -- "nvim-lualine/lualine.nvim", + -- event = "InsertEnter", + -- config = function() + -- local hide_in_width = function() + -- return vim.fn.winwidth(0) > 80 + -- end + -- local icons = require("user.icons") + -- + -- local getLeftSubstring = function(word, length) + -- if #word > length then + -- return string.sub(word, 1, length) .. "..." + -- else + -- return word + -- end + -- end + -- + -- -- start for lsp + -- local list_registered_providers_names = function(filetype) + -- local s = require("null-ls.sources") + -- local available_sources = s.get_available(filetype) + -- local registered = {} + -- for _, source in ipairs(available_sources) do + -- for method in pairs(source.methods) do + -- registered[method] = registered[method] or {} + -- table.insert(registered[method], source.name) + -- end + -- end + -- return registered + -- end + -- + -- local null_ls = require("null-ls") + -- -- for formatter + -- local list_registered = function(filetype) + -- local method = null_ls.methods.FORMATTING + -- local registered_providers = list_registered_providers_names(filetype) + -- return registered_providers[method] or {} + -- end + -- + -- --- for linter + -- local alternative_methods = { + -- null_ls.methods.DIAGNOSTICS, + -- null_ls.methods.DIAGNOSTICS_ON_OPEN, + -- null_ls.methods.DIAGNOSTICS_ON_SAVE, + -- } + -- + -- local linter_list_registered = function(filetype) + -- local registered_providers = list_registered_providers_names(filetype) + -- local providers_for_methods = vim.iter(vim.tbl_map(function(m) + -- return registered_providers[m] or {} + -- end, alternative_methods)) + -- + -- return providers_for_methods + -- end + -- -- end for lsp + -- + -- local lsp_info = { + -- function() + -- local msg = "LS Inactive" + -- local buf_ft = vim.bo.filetype + -- -- start register + -- local buf_clients = vim.lsp.get_clients() + -- local buf_client_names = {} + -- if next(buf_clients) == nil then + -- -- TODO: clean up this if statement + -- if type(msg) == "boolean" or #msg == 0 then + -- return "LS Inactive" + -- end + -- return msg + -- end + -- -- add client + -- for _, client in pairs(buf_clients) do + -- if client.name ~= "null-ls" and client.name ~= "copilot" then + -- table.insert(buf_client_names, client.name) + -- end + -- end + -- -- add formatter + -- local supported_formatters = list_registered(buf_ft) + -- vim.list_extend(buf_client_names, supported_formatters) + -- -- add linter + -- local supported_linters = linter_list_registered(buf_ft) + -- vim.list_extend(buf_client_names, supported_linters) + -- -- decomple + -- local unique_client_names = vim.fn.uniq(buf_client_names) + -- local msg = table.concat(unique_client_names, ", ") + -- return msg + -- end, + -- --icon = " ", + -- icon = icons.ui.Gear .. "", + -- padding = 1, + -- } + -- + -- local diagnostics = { + -- "diagnostics", + -- sources = { "nvim_diagnostic" }, + -- sections = { "error", "warn" }, + -- -- symbols = { error = " ", warn = " " }, + -- symbols = { + -- error = icons.diagnostics.BoldError .. " ", + -- warn = icons.diagnostics.BoldWarning .. " ", + -- }, + -- colored = true, + -- update_in_insert = false, + -- always_visible = false, + -- } + -- + -- local diff = { + -- "diff", + -- colored = true, + -- -- symbols = { added = " ", modified = " ", removed = " " }, -- changes diff symbols + -- symbols = { + -- added = icons.git.LineAdded .. " ", + -- modified = icons.git.LineModified .. " ", + -- removed = icons.git.LineRemoved .. " ", + -- }, -- changes diff symbols + -- cond = hide_in_width, + -- } + -- + -- local spaces = function() + -- -- return " " .. vim.api.nvim_buf_get_option(0, "shiftwidth") + -- return icons.ui.Tab .. " " .. vim.api.nvim_get_option_value(0, "shiftwidth") + -- end + -- + -- local mode = { + -- "mode", + -- padding = 1, + -- separator = { left = " " }, + -- -- right_padding = 3, + -- fmt = function(str) + -- return icons.ui.Neovim .. " " .. str + -- end, + -- } + -- local branch = { + -- "branch", + -- padding = 1, + -- } + -- + -- local get_branch = function() + -- if vim.b.gitsigns_head ~= nil then + -- return icons.git.Branch2 .. " " .. getLeftSubstring(vim.b.gitsigns_head, 6) + -- else + -- return icons.git.Branch2 .. vim.fn.fnamemodify("", ":t") + -- end + -- end + -- + -- local lsp_progress = {} + -- local data_ok, lspprogress = pcall(require, "lsp-progress") + -- if data_ok then + -- lsp_progress = lspprogress.progress + -- end + -- -- stylua: ignore + -- -- local onedark=vim.fn.fnamemodify("auto", ":t") + -- local onedark={} + -- local is_transparat = true + -- local status_ok, onedarkpro = pcall(require, "onedarkpro.helpers") + -- if status_ok then + -- local colors = onedarkpro.get_colors("onedark") + -- + -- onedark = { + -- normal = { + -- a = { bg = colors.green, fg = colors.bg }, + -- b = { bg = colors.fg_gutter, fg = colors.green }, + -- c = { + -- bg = is_transparat and colors.none or colors.bg_statusline, + -- fg = colors.fg, + -- }, + -- }, + -- + -- insert = { + -- a = { bg = colors.blue, fg = colors.bg }, + -- b = { bg = colors.fg_gutter, fg = colors.blue }, + -- }, + -- visual = { + -- a = { bg = colors.yellow, fg = colors.bg }, + -- b = { bg = colors.fg_gutter, fg = colors.yellow }, + -- }, + -- replace = { + -- a = { bg = colors.red, fg = colors.bg }, + -- b = { bg = colors.fg_gutter, fg = colors.red }, + -- }, + -- command = { + -- a = { bg = colors.purple, fg = colors.bg }, + -- b = { bg = colors.fg_gutter, fg = colors.purple }, + -- }, + -- terminal = { + -- a = { bg = colors.cyan, fg = colors.bg }, + -- b = { bg = colors.fg_gutter, fg = colors.cyan }, + -- }, + -- inactive = { + -- a = { bg = colors.bg, fg = colors.blue }, + -- b = { bg = colors.bg, fg = colors.fg_gutter_inactive, gui = "bold" }, + -- c = { + -- bg = is_transparat and colors.none or colors.bg, + -- fg = colors.fg_gutter_inactive, + -- }, + -- }, + -- } + -- end + -- + -- require("lualine").setup({ + -- options = { + -- theme = onedark, + -- -- theme = "auto", + -- component_separators = { left = "", right = "" }, + -- section_separators = { left = "", right = "" }, + -- disabled_filetypes = { + -- "TelescopePrompt", + -- "packer", + -- "alpha", + -- "dashboard", + -- "NvimTree", + -- "Outline", + -- "DressingInput", + -- "toggleterm", + -- "lazy", + -- "mason", + -- "neo-tree", + -- "startuptime", + -- }, + -- always_divide_middle = true, + -- }, + -- sections = { + -- lualine_a = { + -- mode, + -- }, + -- lualine_b = { get_branch }, + -- lualine_c = { lsp_info, diagnostics, lsp_progress }, + -- lualine_x = { diff, spaces, "filetype" }, + -- lualine_y = { "progress" }, + -- lualine_z = { + -- { "location", separator = { right = " " }, padding = 1 }, + -- }, + -- }, + -- inactive_sections = { + -- lualine_a = { "filename" }, + -- lualine_b = {}, + -- lualine_c = {}, + -- lualine_x = {}, + -- lualine_y = {}, + -- lualine_z = { "location" }, + -- }, + -- tabline = {}, + -- extensions = {}, + -- }) + -- end, + -- }, } diff --git a/lua/custom/plugins/onedarkpro.lua b/lua/custom/plugins/onedarkpro.lua index f9bc2b1..f0c7b3e 100644 --- a/lua/custom/plugins/onedarkpro.lua +++ b/lua/custom/plugins/onedarkpro.lua @@ -1,114 +1,114 @@ return { - { "navarasu/onedark.nvim", enabled = false }, - { - "olimorris/onedarkpro.nvim", - priority = 1000, -- Ensure it loads first - config = function() - local is_transparent = false - require("onedarkpro").setup({ - styles = { - types = "NONE", - methods = "NONE", - numbers = "NONE", - strings = "NONE", - comments = "italic", - keywords = "bold,italic", - constants = "NONE", - functions = "italic", - operators = "NONE", - variables = "NONE", - parameters = "NONE", - conditionals = "italic", - virtual_text = "NONE", - tags = "italic", - }, - colors = { - onedark = { - green = "#99c379", - gray = "#8094b4", - red = "#e06c75", - purple = "#c678dd", - yellow = "#e5c07a", - blue = "#61afef", - cyan = "#56b6c2", - bg_statusline = "#282c34", - indentline = "#3b4261", - float_bg = "#282c34", - }, - }, - options = { - cursorline = true, - transparency = is_transparent, - terminal_colors = true, - }, - highlights = { - -- overide cursor line fill colors - LineNr = { fg = "#49505E" }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. - CursorLineNr = { fg = "${blue}" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. - CursorLine = { bg = "#333842" }, - Cursor = { fg = "${bg}", bg = "${fg}" }, -- character under the cursor - lCursor = { fg = "${bg}", bg = "${fg}" }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') - CursorIM = { fg = "${bg}", bg = "${fg}" }, -- like Cursor, but used when in IME mode |CursorIM| - CursorColumn = { bg = "#333842" }, -- Screen-column at the cursor, when 'cursorcolumn' is set. - -- overide nvimtree folder icon fill color - NvimTreeFolderIcon = { fg = "${gray}" }, - -- overide nvimtree text fill color folder opened - NvimTreeOpenedFolderName = { fg = "${blue}" }, - -- overide nvimtree text fill color root folder - NvimTreeRootFolder = { fg = "${yellow}" }, - NvimTreeSpecialFile = { fg = "${orange}" }, - NvimTreeWinSeparator = { fg = "#202329" }, - NvimTreeIndentMarker = { fg = "#3E4450" }, - -- overide indenline fill color - IblIndent = { fg = "#3E4450" }, - -- overide cmp cursorline fill color with #333842 - PmenuSel = { bg = "#333842" }, - illuminatedWord = { bg = "#3b4261" }, - illuminatedCurWord = { bg = "#3b4261" }, - IlluminatedWordText = { bg = "#3b4261" }, - IlluminatedWordRead = { bg = "#3b4261" }, - IlluminatedWordWrite = { bg = "#3b4261" }, - StatusLine = { fg = "#f8f8f2", bg = is_transparent and "NONE" or "${bg}" }, - StatusLineTerm = { fg = "#f8f8f2", bg = "${bg}" }, - BufferLineFill = { bg = is_transparent and "NONE" or "${bg}" }, - ["@string.special.url.html"] = { fg = "${green}" }, - ["@lsp.type.parameter"] = { fg = "${gray}" }, - -- ["@text.uri.html"] = { fg = "${green}" }, - -- ["@tag.javascript"] = { fg = "${red}" }, - -- ["@tag.attribute"] = { fg = "${orange}", style = "italic" }, - -- ["@constructor.javascript"] = { fg = "${red}" }, - -- ["@variable"] = { fg = "${fg}", style = "NONE" }, -- various variable names - -- ["@variable.builtin"] = { fg = "${red}", style = "NONE" }, - -- ["@variable.member"] = "${cyan}", - -- ["@variable.parameter"] = "${red}", - -- ["@property"] = { fg = "${cyan}" }, -- similar to `@field` - ["@property.lua"] = { fg = "${red}", bg = "NONE" }, - ["@lsp.type.property.lua"] = { fg = "${cyan}", bg = "NONE" }, - ["@lsp.type.variable.lua"] = { fg = "${red}", bg = "NONE" }, - NvimTreeGitDirty = { fg = "${yellow}" }, - Pmenu = { fg = "${fg}", bg = "${bg}" }, - PmenuThumb = { bg = "${gray}" }, -- Popup menu: Thumb of the scrollbar. - -- overide lualine fill color with bg color - LualineNormal = { bg = "${bg}" }, - -- overide lualine_c fill color with bg color - LualineC = { bg = "${bg}" }, - -- overide lualine_x fill color with bg color - LualineX = { bg = "${bg}" }, - -- overide which-key fill color with bg color - -- WhichKey = { bg = "${bg}" }, - -- -- overide which-key fill color with bg color - -- WhichKeySeperator = { bg = "${bg}" }, - -- -- overide which-key fill color with bg color - -- WhichKeyDesc = { fg = "${red}" }, - -- -- overide which-key fill color with bg color - -- WhichKeyFloat = { bg = "${bg}" }, - WhichKeyFloat = { bg = is_transparent and "NONE" or "${bg}" }, - -- -- overide which-key fill color with bg color - -- WhichKeyValue = { bg = "${bg}" }, - -- -- overide which-key fill color with bg color - -- WhichKeyBorder = { bg = "${bg}" }, - }, - }) - end, - }, + -- { "navarasu/onedark.nvim", enabled = false }, + -- { + -- "olimorris/onedarkpro.nvim", + -- priority = 1000, -- Ensure it loads first + -- config = function() + -- local is_transparent = false + -- require("onedarkpro").setup({ + -- styles = { + -- types = "NONE", + -- methods = "NONE", + -- numbers = "NONE", + -- strings = "NONE", + -- comments = "italic", + -- keywords = "bold,italic", + -- constants = "NONE", + -- functions = "italic", + -- operators = "NONE", + -- variables = "NONE", + -- parameters = "NONE", + -- conditionals = "italic", + -- virtual_text = "NONE", + -- tags = "italic", + -- }, + -- colors = { + -- onedark = { + -- green = "#99c379", + -- gray = "#8094b4", + -- red = "#e06c75", + -- purple = "#c678dd", + -- yellow = "#e5c07a", + -- blue = "#61afef", + -- cyan = "#56b6c2", + -- bg_statusline = "#282c34", + -- indentline = "#3b4261", + -- float_bg = "#282c34", + -- }, + -- }, + -- options = { + -- cursorline = true, + -- transparency = is_transparent, + -- terminal_colors = true, + -- }, + -- highlights = { + -- -- overide cursor line fill colors + -- LineNr = { fg = "#49505E" }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. + -- CursorLineNr = { fg = "${blue}" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. + -- CursorLine = { bg = "#333842" }, + -- Cursor = { fg = "${bg}", bg = "${fg}" }, -- character under the cursor + -- lCursor = { fg = "${bg}", bg = "${fg}" }, -- the character under the cursor when |language-mapping| is used (see 'guicursor') + -- CursorIM = { fg = "${bg}", bg = "${fg}" }, -- like Cursor, but used when in IME mode |CursorIM| + -- CursorColumn = { bg = "#333842" }, -- Screen-column at the cursor, when 'cursorcolumn' is set. + -- -- overide nvimtree folder icon fill color + -- NvimTreeFolderIcon = { fg = "${gray}" }, + -- -- overide nvimtree text fill color folder opened + -- NvimTreeOpenedFolderName = { fg = "${blue}" }, + -- -- overide nvimtree text fill color root folder + -- NvimTreeRootFolder = { fg = "${yellow}" }, + -- NvimTreeSpecialFile = { fg = "${orange}" }, + -- NvimTreeWinSeparator = { fg = "#202329" }, + -- NvimTreeIndentMarker = { fg = "#3E4450" }, + -- -- overide indenline fill color + -- IblIndent = { fg = "#3E4450" }, + -- -- overide cmp cursorline fill color with #333842 + -- PmenuSel = { bg = "#333842" }, + -- illuminatedWord = { bg = "#3b4261" }, + -- illuminatedCurWord = { bg = "#3b4261" }, + -- IlluminatedWordText = { bg = "#3b4261" }, + -- IlluminatedWordRead = { bg = "#3b4261" }, + -- IlluminatedWordWrite = { bg = "#3b4261" }, + -- StatusLine = { fg = "#f8f8f2", bg = is_transparent and "NONE" or "${bg}" }, + -- StatusLineTerm = { fg = "#f8f8f2", bg = "${bg}" }, + -- BufferLineFill = { bg = is_transparent and "NONE" or "${bg}" }, + -- ["@string.special.url.html"] = { fg = "${green}" }, + -- ["@lsp.type.parameter"] = { fg = "${gray}" }, + -- -- ["@text.uri.html"] = { fg = "${green}" }, + -- -- ["@tag.javascript"] = { fg = "${red}" }, + -- -- ["@tag.attribute"] = { fg = "${orange}", style = "italic" }, + -- -- ["@constructor.javascript"] = { fg = "${red}" }, + -- -- ["@variable"] = { fg = "${fg}", style = "NONE" }, -- various variable names + -- -- ["@variable.builtin"] = { fg = "${red}", style = "NONE" }, + -- -- ["@variable.member"] = "${cyan}", + -- -- ["@variable.parameter"] = "${red}", + -- -- ["@property"] = { fg = "${cyan}" }, -- similar to `@field` + -- ["@property.lua"] = { fg = "${red}", bg = "NONE" }, + -- ["@lsp.type.property.lua"] = { fg = "${cyan}", bg = "NONE" }, + -- ["@lsp.type.variable.lua"] = { fg = "${red}", bg = "NONE" }, + -- NvimTreeGitDirty = { fg = "${yellow}" }, + -- Pmenu = { fg = "${fg}", bg = "${bg}" }, + -- PmenuThumb = { bg = "${gray}" }, -- Popup menu: Thumb of the scrollbar. + -- -- overide lualine fill color with bg color + -- LualineNormal = { bg = "${bg}" }, + -- -- overide lualine_c fill color with bg color + -- LualineC = { bg = "${bg}" }, + -- -- overide lualine_x fill color with bg color + -- LualineX = { bg = "${bg}" }, + -- -- overide which-key fill color with bg color + -- -- WhichKey = { bg = "${bg}" }, + -- -- -- overide which-key fill color with bg color + -- -- WhichKeySeperator = { bg = "${bg}" }, + -- -- -- overide which-key fill color with bg color + -- -- WhichKeyDesc = { fg = "${red}" }, + -- -- -- overide which-key fill color with bg color + -- -- WhichKeyFloat = { bg = "${bg}" }, + -- WhichKeyFloat = { bg = is_transparent and "NONE" or "${bg}" }, + -- -- -- overide which-key fill color with bg color + -- -- WhichKeyValue = { bg = "${bg}" }, + -- -- -- overide which-key fill color with bg color + -- -- WhichKeyBorder = { bg = "${bg}" }, + -- }, + -- }) + -- end, + -- }, } diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index c854f81..b95e32d 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -270,6 +270,7 @@ return { StatusLineTerm = { fg = "#f8f8f2", bg = colors.bg }, BufferLineFill = { bg = colors.bg }, Pmenu = { fg = colors.white, bg = colors.bg }, + WinBarNC = { fg = colors.white, bg = colors.bg }, }, transparent_bg = transparent, -- transparent_bg = is_transparent, @@ -317,7 +318,7 @@ return { -- "eyeliner", "fidget", -- "flash", - -- "gitsigns", + "gitsigns", -- "harpoon", -- "hop", "illuminate", diff --git a/lua/user/whichkey.lua b/lua/user/whichkey.lua index f12f252..e983677 100644 --- a/lua/user/whichkey.lua +++ b/lua/user/whichkey.lua @@ -223,7 +223,7 @@ local mappings2 = { } local mappings = { ["a"] = { "Alpha", "󰕮 Alpha" }, - ["e"] = { "NvimTreeToggle", "󰙅 Explorer" }, + ["e"] = { "NvimTreeToggle", "󰙅 Explorer" }, ["w"] = { "w!", "󰆓 Save" }, ["q"] = { "q!", "󰿅 Quit" }, -- open exloler and close toggleterm