diff --git a/lazy-lock.json b/lazy-lock.json index 058b5b2..c4f1262 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": "6e3546751076890304428150e53bd59198a4505d" }, + "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/plugins/tokyonight.lua b/lua/custom/plugins/tokyonight.lua index 428c899..a0ac9b2 100644 --- a/lua/custom/plugins/tokyonight.lua +++ b/lua/custom/plugins/tokyonight.lua @@ -11,6 +11,18 @@ return { end local transp = false local sidebar = "normal" --"dark , transparent, normal" + local hilight = "#292e42" + local data_exists, config = pcall(require, "core.config") + if data_exists then + local tras = config.transparent_mode + if tras == 1 then + transp = true + sidebar = "transparent" + -- hilight = "#3E4254" + -- hilight = "#353a56" + hilight = "#292e42" + end + end tokyonight.setup({ -- your configuration comes here -- or leave it empty to use the default settings @@ -40,11 +52,8 @@ return { --- function will be called with a ColorScheme table -- @param colors ColorScheme on_colors = function(colors) - colors.bg_statusline = colors.bg - colors.bg_sidebar = colors.bg - colors.bg = colors.bg - colors.bg_dark = colors.bg - colors.terminal_black = colors.bg + colors.bg_highlight = hilight + colors.bg_statusline = colors.none end, --- You can override specific highlights to use other groups or a hex color @@ -59,10 +68,8 @@ return { highlights.Underlined = { underline = false, } - highlights.BufferLineFill = { bg = colors.bg } highlights.NvimTreeWinSeparator = { fg = colors.border, - bg = colors.bg_sidebar, } end, }) diff --git a/lua/custom/plugins/tokyonight_backup.lua b/lua/custom/plugins/tokyonight_backup.lua new file mode 100644 index 0000000..a5f7c34 --- /dev/null +++ b/lua/custom/plugins/tokyonight_backup.lua @@ -0,0 +1,72 @@ +return { + -- { + -- "folke/tokyonight.nvim", + -- lazy = false, + -- priority = 1000, + -- opts = {}, + -- config = function() + -- local status_ok, tokyonight = pcall(require, "tokyonight") + -- if not status_ok then + -- return + -- end + -- local transp = false + -- local sidebar = "normal" --"dark , transparent, normal" + -- tokyonight.setup({ + -- -- your configuration comes here + -- -- or leave it empty to use the default settings + -- style = "night", -- The theme comes in three styles, `storm`, `moon`, a darker variant `night` and `day` + -- light_style = "day", -- The theme is used when the background is set to light + -- transparent = transp, -- Enable this to disable setting the background color + -- terminal_colors = true, -- Configure the colors used when opening a `:terminal` in Neovim + -- styles = { + -- -- Style to be applied to different syntax groups + -- -- Value is any valid attr-list value for `:help nvim_set_hl` + -- -- comments = { italic = true }, + -- comments = { italic = true }, + -- keywords = { italic = true }, + -- functions = {}, + -- variables = {}, + -- -- Background styles. Can be "dark", "transparent" or "normal" + -- sidebars = sidebar, -- style for sidebars, see below + -- floats = sidebar, -- style for floating windows + -- }, + -- sidebars = { "qf", "help" }, -- Set a darker background on sidebar-like windows. For example: `["qf", "vista_kind", "terminal", "packer"]` + -- day_brightness = 0.2, -- Adjusts the brightness of the colors of the **Day** style. Number between 0 and 1, from dull to vibrant colors + -- hide_inactive_statusline = false, -- Enabling this option, will hide inactive statuslines and replace them with a thin border instead. Should work with the standard **StatusLine** and **LuaLine**. + -- dim_inactive = false, -- dims inactive windows + -- lualine_bold = false, -- When `true`, section headers in the lualine theme will be bold + -- + -- --- You can override specific color groups to use other groups or a hex color + -- --- function will be called with a ColorScheme table + -- -- @param colors ColorScheme + -- on_colors = function(colors) + -- colors.bg_statusline = colors.bg + -- colors.bg_sidebar = colors.bg + -- colors.bg = colors.bg + -- colors.bg_dark = colors.bg + -- colors.terminal_black = colors.bg + -- end, + -- + -- --- You can override specific highlights to use other groups or a hex color + -- --- function will be called with a Highlights and ColorScheme table + -- --@param highlights Highlights + -- -- @param colors ColorScheme + -- on_highlights = function(highlights, colors) + -- highlights.NvimTreeFolderIcon = { + -- bg = colors.none, + -- fg = "#e0af68", + -- } + -- highlights.Underlined = { + -- underline = false, + -- } + -- highlights.BufferLineFill = { bg = colors.none } + -- highlights.NvimTreeWinSeparator = { + -- fg = colors.border, + -- bg = colors.bg_sidebar, + -- } + -- highlights.Pmenu = { fg = colors.fg, bg = colors.bg } + -- end, + -- }) + -- end, + -- }, +} diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua index 15df0bd..f83d4a4 100644 --- a/lua/plugins/cmp.lua +++ b/lua/plugins/cmp.lua @@ -100,8 +100,17 @@ return { end, }, window = { - completion = cmp.config.window.bordered(), - documentation = cmp.config.window.bordered(), + -- completion = cmp.config.window.bordered(), + -- documentation = cmp.config.window.bordered(), + -- remove border window from cmp + completion = { + border = { "╭", "─", "╮", "│", "╯", "─", "╰", "│" }, + winhighlight = "Normal:bg,FloatBorder:bg,CursorLine:PmenuSel,Search:None", + }, + documentation = { + border = { "╭", "─", "╮", "│", "╯", "─", "╰", "│" }, + winhighlight = "Normal:bg,FloatBorder:bg,CursorLine:PmenuSel,Search:None", + }, }, experimental = { ghost_text = lspghost_text, diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua index 1b85603..be827e7 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -253,6 +253,7 @@ return { StatusLine = { fg = "#f8f8f2", bg = colors.bg }, StatusLineTerm = { fg = "#f8f8f2", bg = colors.bg }, BufferLineFill = { bg = colors.bg }, + Pmenu = { fg = colors.white, bg = colors.bg }, }, transparent_bg = transparent, -- transparent_bg = is_transparent, @@ -354,10 +355,53 @@ return { IlluminatedWordText = { bg = "#3b4261" }, IlluminatedWordRead = { bg = "#3b4261" }, IlluminatedWordWrite = { bg = "#3b4261" }, + -- overide lualine fill color with bg color + LualineNormal = { bg = "$bg0" }, + -- overide lualine_c fill color with bg color + LualineC = { bg = "$bg0" }, + -- overide lualine_x fill color with bg color + LualineX = { bg = "$bg0" }, + -- overide which-key fill color with bg color + WhichKey = { bg = "$bg0" }, + -- overide which-key fill color with bg color + WhichKeySeperator = { bg = "$bg0" }, + -- overide which-key fill color with bg color + WhichKeyDesc = { bg = "$bg0" }, + -- overide which-key fill color with bg color + WhichKeyFloat = { bg = "$bg0" }, + -- overide which-key fill color with bg color + WhichKeyValue = { bg = "$bg0" }, + -- overide which-key fill color with bg color + WhichKeyBorder = { bg = "$bg0" }, + -- overide Lazy fill color with bg color + LazyNormal = { bg = "$bg0" }, + -- overide lazy background color with bg color + LazyBackground = { bg = "$bg0" }, + -- overide Lazy fill color with bg color + LazyH1 = { bg = "$bg0" }, + -- overide Lazy fill color with bg color + LazyH2 = { bg = "$bg0" }, + -- overide Lazy fill color with bg color + LazyH3 = { bg = "$bg0" }, + -- overide Lazy fill color with bg color + LazyH4 = { bg = "$bg0" }, + -- overide Lazy fill color with bg color + LazyH5 = { bg = "$bg0" }, + -- overide Lazy fill color with bg color + LazyH6 = { bg = "$bg0" }, + -- overide Lazy fill color with bg color + LazyButton = { bg = "$bg0" }, + -- overide Lazy fill color with bg color + LazyButtonActive = { bg = "$bg0" }, + -- overide Lazy fill color with bg color + LazySpecial = { bg = "$bg0" }, + -- overide Lazy fill color with bg color + LazyProgress = { bg = "$bg0" }, + Pmenu = { fg = "$fg", bg = "$bg0" }, }, transparent = transparent, lualine = { - transparent = transparent, + transparent = true, }, }) require("onedark").load() @@ -435,6 +479,7 @@ return { LazySpecial = { bg = "bg1" }, -- overide Lazy fill color with bg color LazyProgress = { bg = "bg1" }, + Pmenu = { bg = "bg1" }, }, }, })