diff --git a/lazy-lock.json b/lazy-lock.json index 393780a..1ca2ca6 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -13,6 +13,7 @@ "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" }, @@ -22,8 +23,8 @@ "mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, - "none-ls-extras.nvim": { "branch": "main", "commit": "f0746bf4f1a21d6e1d2002f671fb9b46d2146de7" }, - "none-ls.nvim": { "branch": "main", "commit": "88821b67e6007041f43b802f58e3d9fa9bfce684" }, + "none-ls-extras.nvim": { "branch": "main", "commit": "c7264e9b97a051ccb955ae178b6fb3e0e9936a45" }, + "none-ls.nvim": { "branch": "main", "commit": "709a5e56f4273deca737d43355212ac94c1b5083" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" }, diff --git a/lua/core/init.lua b/lua/core/init.lua index c77801c..44c794d 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -17,5 +17,5 @@ require("custom.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 8ff1867..3e1b5cd 100644 --- a/lua/custom/plugins/githubdark.lua +++ b/lua/custom/plugins/githubdark.lua @@ -1,99 +1,100 @@ 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" }, + NormalSB = { fg = "fg1", bg = "bg1" }, -- normal text + }, + }, + }) + end, + }, }