diff --git a/lazy-lock.json b/lazy-lock.json index 3f59d24..135d4a0 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -11,7 +11,6 @@ "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "code_runner.nvim": { "branch": "main", "commit": "0c701cae3265c79b4fdfd4b35a4f3d7c5986d46c" }, "codeium.vim": { "branch": "main", "commit": "5b8f68d5c0e32ae97d073a56ff14dba5646ec223" }, - "dracula.nvim": { "branch": "main", "commit": "8d8bddb8814c3e7e62d80dda65a9876f97eb699c" }, "dressing.nvim": { "branch": "master", "commit": "42d767b04c50a6966c9633e3968bc65c0c2f2bfc" }, "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, @@ -25,6 +24,7 @@ "mini.animate": { "branch": "main", "commit": "82519630b2760ffc516ebc387bef632f9c07b9f5" }, "mini.indentscope": { "branch": "main", "commit": "cf07f19e718ebb0bcc5b00999083ce11c37b8d40" }, "neoscroll.nvim": { "branch": "master", "commit": "21d52973bde32db998fc8b6590f87eb3c3c6d8e4" }, + "nightfox.nvim": { "branch": "main", "commit": "57b8154aba0de8ced36722ea2674a7b97e4f468f" }, "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, "none-ls-extras.nvim": { "branch": "main", "commit": "c226aca7a506dd4325fb96188bffe804d24bbf18" }, "none-ls.nvim": { "branch": "main", "commit": "ff3819c52ca04232fb70fbd6c1639de9abcbe122" }, diff --git a/lua/custom/default.lua b/lua/custom/default.lua index 0012646..8f78f75 100644 --- a/lua/custom/default.lua +++ b/lua/custom/default.lua @@ -12,7 +12,7 @@ -- catppuccin, catppuccin-latte, catppuccin-frappe, catppuccin-macchiato, catppuccin-mocha -- dracula -- nightfox, dayfox, dawnfox, duskfox, nordfox, terafox, carbonfox -vim.g.pcode_colorscheme = "dracula" +vim.g.pcode_colorscheme = "nightfox" -- custom transparent mode -- only support diff --git a/lua/custom/plugins/onedarkpro.lua b/lua/custom/plugins/onedarkpro.lua index 9421bd3..f32432d 100644 --- a/lua/custom/plugins/onedarkpro.lua +++ b/lua/custom/plugins/onedarkpro.lua @@ -3,16 +3,39 @@ return { -- priority = 1000, -- Ensure it loads first -- config = function() -- 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", + -- }, -- colors = { -- -- red = "#FF0000", + -- bg_statusline = "#282c34", -- }, -- options = { -- cursorline = true, -- transparency = false, + -- terminal_colors = true, -- }, -- highlights = { -- -- overide cursor line fill colors + -- LineNr = { fg = "${fg}" }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. + -- CursorLineNr = { fg = "${fg}" }, -- 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 = "#6776a7" }, -- -- overide nvimtree text fill color folder opened @@ -30,6 +53,7 @@ return { -- StatusLineTerm = { fg = "#f8f8f2", bg = "${bg}" }, -- BufferLineFill = { bg = "${bg}" }, -- Pmenu = { fg = "${fg}", bg = "${bg}" }, + -- PmenuThumb = { bg = "#3b4261" }, -- Popup menu: Thumb of the scrollbar. -- -- overide lualine fill color with bg color -- LualineNormal = { bg = "${bg}" }, -- -- overide lualine_c fill color with bg color diff --git a/lua/custom/plugins/tokyonight.lua b/lua/custom/plugins/tokyonight.lua index a0ac9b2..0196ea9 100644 --- a/lua/custom/plugins/tokyonight.lua +++ b/lua/custom/plugins/tokyonight.lua @@ -71,6 +71,8 @@ return { highlights.NvimTreeWinSeparator = { fg = colors.border, } + highlights.BufferLineFill = { bg = colors.bg } + highlights.NvimTreeSpecialFile = { fg = colors.purple, underline = false } end, }) end, diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index ecffc55..e8ba857 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -427,60 +427,43 @@ return { options = { terminal_colors = true, transparent = transparent, + styles = { -- Style to be applied to different syntax groups + comments = "italic", -- Value is any valid attr-list value `:help attr-list` + conditionals = "italic", + constants = "NONE", + functions = "italic", + keywords = "bold,italic", + numbers = "NONE", + operators = "NONE", + strings = "NONE", + types = "NONE", + variables = "NONE", + }, + }, + palettes = { + all = { + bg0 = palette.bg1, + bg = palette.bg1, + }, }, - palettes = {}, specs = {}, groups = { all = { -- overide bufferline fill color - BufferLineFill = { bg = "bg1" }, - BufferLineUnfocusedFill = { bg = "bg1" }, + BufferLineFill = { bg = palette.bg1 }, + BufferLineUnfocusedFill = { bg = palette.bg }, -- overide nvimtree fill color with bg color - NvimTreeNormal = { bg = "bg1" }, - -- overide statusline fill color with bg color - StatusLine = { bg = "bg1" }, - StatusLineTerm = { bg = "bg1" }, + NvimTreeNormal = { bg = palette.bg }, + NvimTreeWinSeparator = { + fg = palette.bg0, + }, + Underlined = { style = "NONE" }, -- overide statusline fill color with bg color + StatusLine = { bg = "NONE" }, + StatusLineTerm = { bg = palette.bg }, -- overide lualine fill color with bg color - LualineNormal = { bg = "bg1" }, - -- overide lualine_c fill color with bg color - LualineC = { bg = "bg1" }, - -- overide lualine_x fill color with bg color - LualineX = { bg = "bg1" }, - -- overide which-key fill color with bg color - WhichKey = { bg = "bg1" }, - -- overide which-key fill color with bg color - WhichKeySeperator = { bg = "bg1" }, - -- overide which-key fill color with bg color - WhichKeyDesc = { bg = "bg1" }, - -- overide which-key fill color with bg color - WhichKeyFloat = { bg = "bg1" }, - -- overide which-key fill color with bg color - WhichKeyValue = { bg = "bg1" }, - -- overide which-key fill color with bg color - WhichKeyBorder = { bg = "bg1" }, - -- overide Lazy fill color with bg color - LazyNormal = { bg = "bg1" }, - -- overide Lazy fill color with bg color - LazyH1 = { bg = "bg1" }, - -- overide Lazy fill color with bg color - LazyH2 = { bg = "bg1" }, - -- overide Lazy fill color with bg color - LazyH3 = { bg = "bg1" }, - -- overide Lazy fill color with bg color - LazyH4 = { bg = "bg1" }, - -- overide Lazy fill color with bg color - LazyH5 = { bg = "bg1" }, - -- overide Lazy fill color with bg color - LazyH6 = { bg = "bg1" }, - -- overide Lazy fill color with bg color - LazyButton = { bg = "bg1" }, - -- overide Lazy fill color with bg color - LazyButtonActive = { bg = "bg1" }, - -- overide Lazy fill color with bg color - LazySpecial = { bg = "bg1" }, - -- overide Lazy fill color with bg color - LazyProgress = { bg = "bg1" }, - Pmenu = { bg = "bg1" }, + LualineNormal = { bg = palette.bg }, + Pmenu = { bg = "bg3" }, + PmenuSel = { bg = "bg3" }, }, }, })