diff --git a/lazy-lock.json b/lazy-lock.json index 2105ebb..4c5410d 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" }, @@ -44,7 +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" }, + "onedark.nvim": { "branch": "master", "commit": "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429" }, "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "smart-splits.nvim": { "branch": "master", "commit": "f6fcb79527872e9330c554915af2ca511c388390" }, "telescope.nvim": { "branch": "master", "commit": "7472420f8734c710bd7009081cef9b97f08a3821" }, diff --git a/lua/core/init.lua b/lua/core/init.lua index e308fbe..43f87ad 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -16,4 +16,4 @@ require("user.keymaps") -- require("user.bufferline") -- require("user.chat_gpt") -- vim.cmd("colorscheme one_monokai") --- vim.cmd("colorscheme onedark") +vim.cmd("colorscheme onedark") diff --git a/lua/custom/default.lua b/lua/custom/default.lua index 0012646..fc70499 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 = "tokyonight" -- custom transparent mode -- only support diff --git a/lua/custom/plugins/onedarkpro.lua b/lua/custom/plugins/onedarkpro.lua index 9d93a82..063d4c7 100644 --- a/lua/custom/plugins/onedarkpro.lua +++ b/lua/custom/plugins/onedarkpro.lua @@ -23,13 +23,14 @@ return { colors = { onedark = { green = "#99c379", - gray = "#636e84", + gray = "#8094b4", red = "#e06c75", purple = "#c678dd", yellow = "#e5c07a", blue = "#61afef", cyan = "#56b6c2", bg_statusline = "#282c34", + indentline = "#3b4261", }, }, options = { @@ -39,7 +40,7 @@ return { }, highlights = { -- overide cursor line fill colors - LineNr = { fg = "${fg}" }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. + LineNr = { fg = "#49505E" }, -- Line number for ":number" and ":#" commands, and when 'number' or 'relativenumber' option is set. CursorLineNr = { fg = "${blue}" }, -- Like LineNr when 'cursorline' or 'relativenumber' is set for the cursor line. CursorLine = { bg = "#333842" }, Cursor = { fg = "${bg}", bg = "${fg}" }, -- character under the cursor @@ -47,11 +48,17 @@ return { 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 = "${blue}" }, + NvimTreeFolderIcon = { fg = "${gray}" }, -- overide nvimtree text fill color folder opened NvimTreeOpenedFolderName = { fg = "${blue}" }, -- overide nvimtree text fill color root folder - NvimTreeRootFolder = { fg = "${blue}" }, + NvimTreeRootFolder = { fg = "${yellow}" }, + NvimTreeSpecialFile = { fg = "${yellow}" }, + NvimTreeWinSeparator = { + fg = "#202329", + }, + -- overide indenline fill color + IblIndent = { fg = "#3E4450" }, -- overide cmp cursorline fill color with #333842 PmenuSel = { bg = "#333842" }, illuminatedWord = { bg = "#3b4261" },