diff --git a/lazy-lock.json b/lazy-lock.json index 2da6030..94ad0db 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -13,7 +13,6 @@ "codeium.vim": { "branch": "main", "commit": "bef9cbaa5c19ab85d8048f364bfc0ac8c7ab335d" }, "dressing.nvim": { "branch": "master", "commit": "42d767b04c50a6966c9633e3968bc65c0c2f2bfc" }, "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, - "github-nvim-theme": { "branch": "main", "commit": "7e08e9cbf6da64b151f708a3e7e9f43447ae0171" }, "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" }, @@ -44,6 +43,7 @@ "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" }, "nvim-ts-rainbow2": { "branch": "master", "commit": "b3120cd5ae9ca524af9cb602f41e12e301fa985f" }, "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, + "onedarkpro.nvim": { "branch": "main", "commit": "ec07364f3cfa9cc6467bf067a490cfd74011efcd" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "smart-splits.nvim": { "branch": "master", "commit": "f6fcb79527872e9330c554915af2ca511c388390" }, "telescope.nvim": { "branch": "master", "commit": "e9e01d699843af530ef4ad2c8679a7e273bb3dd1" }, diff --git a/lua/core/init.lua b/lua/core/init.lua index 93e561c..8289a90 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -17,5 +17,5 @@ require("user.keymaps") -- 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 7a1d34d..95afb22 100644 --- a/lua/custom/plugins/githubdark.lua +++ b/lua/custom/plugins/githubdark.lua @@ -1,94 +1,95 @@ 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" }, - -- ["@tag.attribute.html"] = { fg = "#faa356", style = "italic" }, - -- ["@operator.html"] = { fg = "#faa356" }, - -- ["@tag"] = { fg = "#fa7970" }, - }, - 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" }, - 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" }, + -- -- ["@tag.attribute.html"] = { fg = "#faa356", style = "italic" }, + -- -- ["@operator.html"] = { fg = "#faa356" }, + -- -- ["@tag.html"] = { fg = "#fa7970" }, + -- -- ["@tag.delimiter.html"] = { 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" }, + -- 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/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index c2c78f1..0bfe154 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -373,9 +373,13 @@ return { IblIndent = { fg = "#3E4450" }, ["@markup.link.url"] = { fg = "$cyan", fmt = "italic" }, ["@text.uri"] = { fg = "$cyan", fmt = "none" }, - ["@tag"] = { fg = "$red" }, ["@tag.delimiter"] = { fg = "$gray" }, - ["@tag.attribute"] = { fg = "$yellow", fmt = "italic" }, + ["@tag.html"] = { fg = "$red" }, + ["@tag.attribute"] = { fg = "$orange", fmt = "italic" }, + ["@tag.javascript"] = { fg = "$yellow" }, + ["@constructor.javascript"] = { fg = "$yellow" }, + ["@tag.tsx"] = { fg = "$yellow" }, + ["@constructor.tsx"] = { fg = "$yellow" }, -- NvimTreeFolderIcon = { fg = "#FCC76A" }, NvimTreeSpecialFile = { fg = "$yellow", fmt = "italic" }, BufferLineFill = { bg = "$bg0" },