diff --git a/lazy-lock.json b/lazy-lock.json index 3f59d24..6544fb8 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -11,14 +11,13 @@ "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" }, "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" }, "lsp-progress.nvim": { "branch": "main", "commit": "1c37b1cd0611563a767f0a340d61f265c4c54ecd" }, - "lualine.nvim": { "branch": "master", "commit": "8b56462bfb746760465264de41b4907310f113ec" }, + "lualine.nvim": { "branch": "master", "commit": "3c55675a7bc170d21d7ea70874ae66fbf5cfb0dc" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" }, "mason-null-ls.nvim": { "branch": "main", "commit": "e270134d83ba59425edc53356c6fd337b61bb8dd" }, "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" }, @@ -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": "7472420f8734c710bd7009081cef9b97f08a3821" }, diff --git a/lua/core/init.lua b/lua/core/init.lua index 76d98d9..43f87ad 100644 --- a/lua/core/init.lua +++ b/lua/core/init.lua @@ -16,3 +16,4 @@ require("user.keymaps") -- require("user.bufferline") -- require("user.chat_gpt") -- vim.cmd("colorscheme one_monokai") +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 f32432d..9d93a82 100644 --- a/lua/custom/plugins/onedarkpro.lua +++ b/lua/custom/plugins/onedarkpro.lua @@ -1,78 +1,91 @@ return { - -- "olimorris/onedarkpro.nvim", - -- 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 - -- NvimTreeOpenedFolderName = { fg = "#6776a7" }, - -- -- overide nvimtree text fill color root folder - -- NvimTreeRootFolder = { fg = "#6776a7" }, - -- -- overide cmp cursorline fill color with #333842 - -- PmenuSel = { bg = "#333842" }, - -- illuminatedWord = { bg = "#3b4261" }, - -- illuminatedCurWord = { bg = "#3b4261" }, - -- IlluminatedWordText = { bg = "#3b4261" }, - -- IlluminatedWordRead = { bg = "#3b4261" }, - -- IlluminatedWordWrite = { bg = "#3b4261" }, - -- StatusLine = { fg = "#f8f8f2", bg = "${bg}" }, - -- 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 - -- LualineC = { bg = "${bg}" }, - -- -- overide lualine_x fill color with bg color - -- LualineX = { bg = "${bg}" }, - -- -- overide which-key fill color with bg color - -- WhichKey = { bg = "${bg}" }, - -- -- overide which-key fill color with bg color - -- WhichKeySeperator = { bg = "${bg}" }, - -- -- overide which-key fill color with bg color - -- WhichKeyDesc = { bg = "${bg}" }, - -- -- overide which-key fill color with bg color - -- WhichKeyFloat = { bg = "${bg}" }, - -- -- overide which-key fill color with bg color - -- WhichKeyValue = { bg = "${bg}" }, - -- -- overide which-key fill color with bg color - -- WhichKeyBorder = { bg = "${bg}" }, - -- }, - -- }) - -- end, + { "folke/tokyonight.nvim", enabled = false }, + { + "olimorris/onedarkpro.nvim", + 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 = { + onedark = { + green = "#99c379", + gray = "#636e84", + red = "#e06c75", + purple = "#c678dd", + yellow = "#e5c07a", + blue = "#61afef", + cyan = "#56b6c2", + 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 = "${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 + 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 = "${blue}" }, + -- overide nvimtree text fill color folder opened + NvimTreeOpenedFolderName = { fg = "${blue}" }, + -- overide nvimtree text fill color root folder + NvimTreeRootFolder = { fg = "${blue}" }, + -- overide cmp cursorline fill color with #333842 + PmenuSel = { bg = "#333842" }, + illuminatedWord = { bg = "#3b4261" }, + illuminatedCurWord = { bg = "#3b4261" }, + IlluminatedWordText = { bg = "#3b4261" }, + IlluminatedWordRead = { bg = "#3b4261" }, + IlluminatedWordWrite = { bg = "#3b4261" }, + StatusLine = { fg = "#f8f8f2", bg = "${bg}" }, + StatusLineTerm = { fg = "#f8f8f2", bg = "${bg}" }, + BufferLineFill = { bg = "${bg}" }, + ["@string.special.url.html"] = { fg = "${green}" }, + ["@text.uri.html"] = { fg = "${green}" }, + Pmenu = { fg = "${fg}", bg = "${bg}" }, + PmenuThumb = { bg = "${gray}" }, -- Popup menu: Thumb of the scrollbar. + -- overide lualine fill color with bg color + LualineNormal = { bg = "${bg}" }, + -- overide lualine_c fill color with bg color + LualineC = { bg = "${bg}" }, + -- overide lualine_x fill color with bg color + LualineX = { bg = "${bg}" }, + -- overide which-key fill color with bg color + WhichKey = { bg = "${bg}" }, + -- overide which-key fill color with bg color + WhichKeySeperator = { bg = "${bg}" }, + -- overide which-key fill color with bg color + WhichKeyDesc = { bg = "${bg}" }, + -- overide which-key fill color with bg color + WhichKeyFloat = { bg = "${bg}" }, + -- overide which-key fill color with bg color + WhichKeyValue = { bg = "${bg}" }, + -- overide which-key fill color with bg color + WhichKeyBorder = { bg = "${bg}" }, + }, + }) + end, + }, }