From c7af34ff72e30809aa49c6837178db3000093129 Mon Sep 17 00:00:00 2001 From: "asep.komarudin" Date: Mon, 22 Apr 2024 08:55:33 +0700 Subject: [PATCH] add: update colors scheme config --- lazy-lock.json | 1 - lua/core/init.lua | 2 +- lua/custom/plugins/githubdark.lua | 194 +++++++++++++++--------------- lua/custom/plugins/onedarkpro.lua | 8 +- 4 files changed, 103 insertions(+), 102 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 2bd1384..2f90d5c 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -13,7 +13,6 @@ "codeium.vim": { "branch": "main", "commit": "76790ba8d1b8b3287f72366ea5f55c1d76e6114e" }, "dressing.nvim": { "branch": "master", "commit": "42d767b04c50a6966c9633e3968bc65c0c2f2bfc" }, "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, - "github-nvim-theme": { "branch": "main", "commit": "7e08e9cbf6da64b151f708a3e7e9f43447ae0171" }, "gitsigns.nvim": { "branch": "main", "commit": "52f8da33cc0cadbf1164c4a91c8bfd6895533d67" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "lazy.nvim": { "branch": "main", "commit": "bef521ac89c8d423f9d092e37b58e8af0c099309" }, diff --git a/lua/core/init.lua b/lua/core/init.lua index 09eb45e..4efce92 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -17,5 +17,5 @@ require("custom.autocmd") -- require("user.chat_gpt") -- vim.cmd("colorscheme one_monokai") -- vim.cmd("colorscheme onedark") -vim.cmd("colorscheme github_dark_dimmed") +-- vim.cmd("colorscheme github_dark_dimmed") -- vim.cmd("colorscheme github_dark_high_contrast") diff --git a/lua/custom/plugins/githubdark.lua b/lua/custom/plugins/githubdark.lua index 030fe48..8ff1867 100644 --- a/lua/custom/plugins/githubdark.lua +++ b/lua/custom/plugins/githubdark.lua @@ -1,99 +1,99 @@ return { - { - "navarasu/onedark.nvim", - enabled = false, - }, - { - "projekt0n/github-nvim-theme", - lazy = false, -- make sure we load this during startup if it is your main colorscheme - priority = 1000, -- make sure to load this before all the other start plugins - config = function() - local is_transparent = false - local palette = require("github-theme.palette").load("github_dark_dimmed") - require("github-theme").setup({ - options = { - -- Compiled file's destination location - compile_path = vim.fn.stdpath("cache") .. "/github-theme", - compile_file_suffix = "_compiled", -- Compiled file suffix - hide_end_of_buffer = true, -- Hide the '~' character at the end of the buffer for a cleaner look - hide_nc_statusline = true, -- Override the underline style for non-active statuslines - transparent = is_transparent, -- Disable setting background - terminal_colors = true, -- Set terminal colors (vim.g.terminal_color_*) used in `:terminal` - dim_inactive = false, -- Non focused panes set to alternative background - module_default = true, -- Default enable value for modules - styles = { -- Style to be applied to different syntax groups - comments = "italic", -- Value is any valid attr-list value `:help attr-list` - functions = "italic", - keywords = "NONE", - variables = "NONE", - conditionals = "NONE", - constants = "NONE", - numbers = "NONE", - operators = "NONE", - strings = "NONE", - types = "NONE", - }, - inverse = { -- Inverse highlight for different types - match_paren = false, - visual = false, - search = false, - }, - darken = { -- Darken floating windows and sidebar-like windows - floats = false, - sidebars = { - enabled = true, - list = {}, -- Apply dark background to specific windows - }, - }, - modules = { -- List of various plugins and additional options - -- ... - }, - }, - palettes = { - github_dark_dimmed = { - bg0 = is_transparent and "NONE" or "bg1", - bg1 = is_transparent and "NONE" or "bg", - }, - }, - specs = {}, - groups = { - all = { - illuminatedWord = { bg = "#3b4261" }, - illuminatedCurWord = { bg = "#3b4261" }, - IlluminatedWordText = { bg = "#3b4261" }, - IlluminatedWordRead = { bg = "#3b4261" }, - IlluminatedWordWrite = { bg = "#3b4261" }, - ["@tag.attribute"] = { fg = "#77bdfb", style = "italic" }, - ["@text.uri"] = { fg = palette.const, style = "italic" }, - ["@keyword.return"] = { fg = "#fa7970", style = "italic" }, - -- ["@tag.attribute.html"] = { fg = "#faa356", style = "italic" }, - -- ["@operator.html"] = { fg = "#faa356" }, - -- ["@tag.html"] = { fg = "#fa7970" }, - -- ["@tag.delimiter.html"] = { fg = "#faa356" }, - ["@tag.javascript"] = { fg = "#faa356" }, - ["@tag.tsx"] = { fg = "#faa356" }, - }, - github_dark_high_contrast = { - NvimTreeSpecialFile = { fg = "#faa356", style = "italic" }, - }, - github_dark_dimmed = { - -- As with specs and palettes, a specific style's value will be used over the `all`'s value. - NvimTreeNormal = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" }, - NvimTreeSpecialFile = { fg = "#faa356", style = "italic" }, - NvimTreeIndentMarker = { fg = "#3E4450" }, - BufferLineFill = { bg = is_transparent and "NONE" or "bg1" }, - BufferLineUnfocusedFill = { bg = is_transparent and "NONE" or "bg1" }, - LualineNormal = { bg = is_transparent and "NONE" or "bg1" }, - StatusLine = { bg = is_transparent and "NONE" or "bg1" }, - StatusLineTerm = { bg = is_transparent and "NONE" or "bg1" }, - Pmenu = { bg = is_transparent and "NONE" or "bg1" }, - PmenuSel = { link = "CursorLine" }, - WhichKeyFloat = { bg = is_transparent and "NONE" or "bg1" }, - LazyNormal = { bg = is_transparent and "NONE" or "bg1" }, - LazyBackground = { bg = is_transparent and "NONE" or "bg1" }, - }, - }, - }) - end, - }, + -- { + -- "navarasu/onedark.nvim", + -- enabled = false, + -- }, + -- { + -- "projekt0n/github-nvim-theme", + -- lazy = false, -- make sure we load this during startup if it is your main colorscheme + -- priority = 1000, -- make sure to load this before all the other start plugins + -- config = function() + -- local is_transparent = false + -- local palette = require("github-theme.palette").load("github_dark_dimmed") + -- require("github-theme").setup({ + -- options = { + -- -- Compiled file's destination location + -- compile_path = vim.fn.stdpath("cache") .. "/github-theme", + -- compile_file_suffix = "_compiled", -- Compiled file suffix + -- hide_end_of_buffer = true, -- Hide the '~' character at the end of the buffer for a cleaner look + -- hide_nc_statusline = true, -- Override the underline style for non-active statuslines + -- transparent = is_transparent, -- Disable setting background + -- terminal_colors = true, -- Set terminal colors (vim.g.terminal_color_*) used in `:terminal` + -- dim_inactive = false, -- Non focused panes set to alternative background + -- module_default = true, -- Default enable value for modules + -- styles = { -- Style to be applied to different syntax groups + -- comments = "italic", -- Value is any valid attr-list value `:help attr-list` + -- functions = "italic", + -- keywords = "NONE", + -- variables = "NONE", + -- conditionals = "NONE", + -- constants = "NONE", + -- numbers = "NONE", + -- operators = "NONE", + -- strings = "NONE", + -- types = "NONE", + -- }, + -- inverse = { -- Inverse highlight for different types + -- match_paren = false, + -- visual = false, + -- search = false, + -- }, + -- darken = { -- Darken floating windows and sidebar-like windows + -- floats = false, + -- sidebars = { + -- enabled = true, + -- list = {}, -- Apply dark background to specific windows + -- }, + -- }, + -- modules = { -- List of various plugins and additional options + -- -- ... + -- }, + -- }, + -- palettes = { + -- github_dark_dimmed = { + -- bg0 = is_transparent and "NONE" or "bg1", + -- bg1 = is_transparent and "NONE" or "bg", + -- }, + -- }, + -- specs = {}, + -- groups = { + -- all = { + -- illuminatedWord = { bg = "#3b4261" }, + -- illuminatedCurWord = { bg = "#3b4261" }, + -- IlluminatedWordText = { bg = "#3b4261" }, + -- IlluminatedWordRead = { bg = "#3b4261" }, + -- IlluminatedWordWrite = { bg = "#3b4261" }, + -- ["@tag.attribute"] = { fg = "#77bdfb", style = "italic" }, + -- ["@text.uri"] = { fg = palette.const, style = "italic" }, + -- ["@keyword.return"] = { fg = "#fa7970", style = "italic" }, + -- -- ["@tag.attribute.html"] = { fg = "#faa356", style = "italic" }, + -- -- ["@operator.html"] = { fg = "#faa356" }, + -- -- ["@tag.html"] = { fg = "#fa7970" }, + -- -- ["@tag.delimiter.html"] = { fg = "#faa356" }, + -- ["@tag.javascript"] = { fg = "#faa356" }, + -- ["@tag.tsx"] = { fg = "#faa356" }, + -- }, + -- github_dark_high_contrast = { + -- NvimTreeSpecialFile = { fg = "#faa356", style = "italic" }, + -- }, + -- github_dark_dimmed = { + -- -- As with specs and palettes, a specific style's value will be used over the `all`'s value. + -- NvimTreeNormal = { fg = "fg1", bg = is_transparent and "NONE" or "bg1" }, + -- NvimTreeSpecialFile = { fg = "#faa356", style = "italic" }, + -- NvimTreeIndentMarker = { fg = "#3E4450" }, + -- BufferLineFill = { bg = is_transparent and "NONE" or "bg1" }, + -- BufferLineUnfocusedFill = { bg = is_transparent and "NONE" or "bg1" }, + -- LualineNormal = { bg = is_transparent and "NONE" or "bg1" }, + -- StatusLine = { bg = is_transparent and "NONE" or "bg1" }, + -- StatusLineTerm = { bg = is_transparent and "NONE" or "bg1" }, + -- Pmenu = { bg = is_transparent and "NONE" or "bg1" }, + -- PmenuSel = { link = "CursorLine" }, + -- WhichKeyFloat = { bg = is_transparent and "NONE" or "bg1" }, + -- LazyNormal = { bg = is_transparent and "NONE" or "bg1" }, + -- LazyBackground = { bg = is_transparent and "NONE" or "bg1" }, + -- }, + -- }, + -- }) + -- end, + -- }, } diff --git a/lua/custom/plugins/onedarkpro.lua b/lua/custom/plugins/onedarkpro.lua index 7f6a890..427c41b 100644 --- a/lua/custom/plugins/onedarkpro.lua +++ b/lua/custom/plugins/onedarkpro.lua @@ -86,7 +86,9 @@ return { ["@variable.builtin"] = { fg = "${red}", style = "NONE" }, ["@variable.member"] = "${cyan}", ["@variable.parameter"] = "${red}", - ["@property"] = { fg = "${cyan}" }, -- similar to `@field` + -- ["@property.javascript"] = { fg = "${cyan}" }, -- similar to `@field` + ["@lsp.type.parameter"] = { fg = "${fg}" }, + ["@field.lua"] = { fg = "${gray}" }, NvimTreeGitDirty = { fg = "${yellow}" }, Pmenu = { fg = "${fg}", bg = "${bg}" }, PmenuThumb = { bg = "${gray}" }, -- Popup menu: Thumb of the scrollbar. @@ -111,8 +113,8 @@ return { -- WhichKeyBorder = { bg = "${bg}" }, -- Folded = { bg = "NONE", fg = "${fg}" }, -- line used for closed folds TermCursor = { bg = "${fg}" }, - TSRainbowRed = { fg = "${orange}" }, - TSRainbowOrange = { fg = "${red}" }, + TSRainbowRed = { fg = "${cyan}" }, + TSRainbowCyan = { fg = "${red}" }, }, }) end,