diff --git a/lazy-lock.json b/lazy-lock.json index e2e1797..99daf0e 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -18,7 +18,7 @@ "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" }, "lsp-progress.nvim": { "branch": "main", "commit": "1c37b1cd0611563a767f0a340d61f265c4c54ecd" }, - "lualine.nvim": { "branch": "master", "commit": "26dac2fcadb6e622790ab08e36d0dba3d3765398" }, + "lualine.nvim": { "branch": "master", "commit": "af4c3cf17206810880d2a93562e0a4c0d901c684" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, "mason-null-ls.nvim": { "branch": "main", "commit": "e270134d83ba59425edc53356c6fd337b61bb8dd" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, @@ -47,7 +47,7 @@ "onedark.nvim": { "branch": "master", "commit": "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "smart-splits.nvim": { "branch": "master", "commit": "f6fcb79527872e9330c554915af2ca511c388390" }, - "telescope.nvim": { "branch": "master", "commit": "67c598fdd4fca113224281c85721c4d8a6df055e" }, + "telescope.nvim": { "branch": "master", "commit": "e9e01d699843af530ef4ad2c8679a7e273bb3dd1" }, "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" }, "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" }, "vim-startuptime": { "branch": "master", "commit": "97a88e688482a09c3c4b777d07b509b328a5ec29" }, diff --git a/lua/core/init.lua b/lua/core/init.lua index 511d936..93e561c 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -18,3 +18,4 @@ require("user.keymaps") -- vim.cmd("colorscheme one_monokai") -- vim.cmd("colorscheme onedark") vim.cmd("colorscheme github_dark_dimmed") +-- vim.cmd("colorscheme github_dark_high_contrast") diff --git a/lua/custom/plugins/github.lua b/lua/custom/plugins/github.lua deleted file mode 100644 index 28ed52b..0000000 --- a/lua/custom/plugins/github.lua +++ /dev/null @@ -1,78 +0,0 @@ -return { - "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 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 = false, -- 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 = { - all = { - bg0 = "bg1", - }, - }, - specs = {}, - groups = { - all = { - -- As with specs and palettes, a specific style's value will be used over the `all`'s value. - illuminatedWord = { bg = "#3b4261" }, - illuminatedCurWord = { bg = "#3b4261" }, - IlluminatedWordText = { bg = "#3b4261" }, - IlluminatedWordRead = { bg = "#3b4261" }, - IlluminatedWordWrite = { bg = "#3b4261" }, - NvimTreeNormal = { fg = "fg1", bg = "bg1" }, - NvimTreeSpecialFile = { fg = "fg1", style = "italic" }, - BufferLineFill = { bg = "bg1" }, - BufferLineUnfocusedFill = { bg = "bg1" }, - LualineNormal = { bg = "bg1" }, - StatusLine = { bg = "bg1" }, - StatusLineTerm = { bg = "bg1" }, - Pmenu = { bg = "bg1" }, - PmenuSel = { link = "CursorLine" }, - WhichKeyFloat = { bg = "bg1" }, - LazyNormal = { bg = "bg1" }, - LazyBackground = { bg = "bg1" }, - ["@tag.attribute"] = { fg = palette.field, style = "italic" }, - ["@text.uri"] = { fg = palette.const, style = "italic" }, - }, - }, - }) - end, -} diff --git a/lua/custom/plugins/githubdark.lua b/lua/custom/plugins/githubdark.lua index c572395..78e35ea 100644 --- a/lua/custom/plugins/githubdark.lua +++ b/lua/custom/plugins/githubdark.lua @@ -1,69 +1,84 @@ return { - -- "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() - -- 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 = false, -- 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 = "NONE", -- Value is any valid attr-list value `:help attr-list` - -- functions = "NONE", - -- 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 = {}, - -- specs = {}, - -- groups = { - -- -- As with specs and palettes, the values defined under `all` will be applied to every style. - -- all = { - -- -- If `link` is defined it will be applied over any other values defined - -- Whitespace = { link = "Comment" }, - -- - -- -- Specs are used for the template. Specs have their palette's as a field that can be accessed - -- IncSearch = { bg = "palette.cyan" }, - -- illuminatedWord = { bg = "#3b4261" }, - -- illuminatedCurWord = { bg = "#3b4261" }, - -- IlluminatedWordText = { bg = "#3b4261" }, - -- IlluminatedWordRead = { bg = "#3b4261" }, - -- IlluminatedWordWrite = { bg = "#3b4261" }, - -- -- NvimTreeNormal = { fg = "palette.fg1", bg = "palette.bg2" }, - -- }, - -- github_dark = { - -- -- As with specs and palettes, a specific style's value will be used over the `all`'s value. - -- PmenuSel = { bg = "#73daca", fg = "bg0" }, - -- }, - -- }, - -- }) - -- end, + "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 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 = false, -- 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 = "bg1", + }, + }, + specs = {}, + groups = { + all = { + illuminatedWord = { bg = "#3b4261" }, + illuminatedCurWord = { bg = "#3b4261" }, + IlluminatedWordText = { bg = "#3b4261" }, + IlluminatedWordRead = { bg = "#3b4261" }, + IlluminatedWordWrite = { bg = "#3b4261" }, + ["@tag.attribute"] = { fg = "#faa356", style = "italic" }, + ["@text.uri"] = { fg = palette.const, style = "italic" }, + ["@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 = "bg1" }, + NvimTreeSpecialFile = { fg = "#faa356", style = "italic" }, + BufferLineFill = { bg = "bg1" }, + BufferLineUnfocusedFill = { bg = "bg1" }, + LualineNormal = { bg = "bg1" }, + StatusLine = { bg = "bg1" }, + StatusLineTerm = { bg = "bg1" }, + Pmenu = { bg = "bg1" }, + PmenuSel = { link = "CursorLine" }, + WhichKeyFloat = { bg = "bg1" }, + LazyNormal = { bg = "bg1" }, + LazyBackground = { bg = "bg1" }, + }, + }, + }) + end, }