From 9a2cbed5a89d44a9a996d540782605f21bb6f884 Mon Sep 17 00:00:00 2001 From: asep komarudin Date: Wed, 13 Mar 2024 19:33:59 +0700 Subject: [PATCH] add: update config --- lazy-lock.json | 6 +- lua/custom/default.lua | 5 +- lua/custom/plugins/tokyonight.lua | 156 +++++++++++++++--------------- lua/plugins/colorscheme.lua | 4 + lua/plugins/transparant.lua | 12 ++- lua/user/tokyonight.lua | 7 +- 6 files changed, 100 insertions(+), 90 deletions(-) diff --git a/lazy-lock.json b/lazy-lock.json index 4c5410d..ae10a22 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -26,7 +26,7 @@ "neoscroll.nvim": { "branch": "master", "commit": "21d52973bde32db998fc8b6590f87eb3c3c6d8e4" }, "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" }, "none-ls-extras.nvim": { "branch": "main", "commit": "c226aca7a506dd4325fb96188bffe804d24bbf18" }, - "none-ls.nvim": { "branch": "main", "commit": "ff3819c52ca04232fb70fbd6c1639de9abcbe122" }, + "none-ls.nvim": { "branch": "main", "commit": "bc543fa6c9ca1b7cd39d1bb555a6276789b329a6" }, "nui.nvim": { "branch": "main", "commit": "a0fd35fcbb4cb479366f1dc5f20145fd718a3733" }, "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" }, "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, @@ -43,11 +43,11 @@ "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" }, "nvim-ts-rainbow2": { "branch": "master", "commit": "b3120cd5ae9ca524af9cb602f41e12e301fa985f" }, "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" }, - "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" }, + "telescope.nvim": { "branch": "master", "commit": "b323abeb4baf9e4851c3af1961e770ce76c657c7" }, "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" }, + "tokyonight.nvim": { "branch": "main", "commit": "67c6050e1ca41260c919236a098ba278472c7520" }, "vim-illuminate": { "branch": "master", "commit": "305bf07b919ac526deb5193280379e2f8b599926" }, "vim-startuptime": { "branch": "master", "commit": "97a88e688482a09c3c4b777d07b509b328a5ec29" }, "vim-visual-multi": { "branch": "master", "commit": "1c9207b28c8898ab01b54e6d6b61b0b820a814bc" }, diff --git a/lua/custom/default.lua b/lua/custom/default.lua index eaa0127..fe714cd 100644 --- a/lua/custom/default.lua +++ b/lua/custom/default.lua @@ -5,14 +5,13 @@ -- sonokai, sonokai_atlantis, -- sonokai_andromeda,sonokai_shusia,sonokai_maia,sonokai_espresso -- material, material_deepocean, material_palenight, material_lighter, material_darker --- onedark, onedark_darker, onedark_cool, onedark_deep,onedark_warm, --- onedark_warmer, onedark_light +-- onedark -- lunar -- nord -- catppuccin, catppuccin-latte, catppuccin-frappe, catppuccin-macchiato, catppuccin-mocha -- dracula -- nightfox, dayfox, dawnfox, duskfox, nordfox, terafox, carbonfox -vim.g.pcode_colorscheme = "onedark" +vim.g.pcode_colorscheme = "tokyonight" -- custom transparent mode -- only support diff --git a/lua/custom/plugins/tokyonight.lua b/lua/custom/plugins/tokyonight.lua index 0196ea9..eb36823 100644 --- a/lua/custom/plugins/tokyonight.lua +++ b/lua/custom/plugins/tokyonight.lua @@ -1,80 +1,80 @@ 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" - 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 - 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_highlight = hilight - colors.bg_statusline = colors.none - 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.NvimTreeWinSeparator = { - fg = colors.border, - } - highlights.BufferLineFill = { bg = colors.bg } - highlights.NvimTreeSpecialFile = { fg = colors.purple, underline = false } - end, - }) - end, - }, + -- { + -- "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" + -- 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 + -- 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_highlight = hilight + -- colors.bg_statusline = colors.none + -- 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.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 9c9836c..f70e96b 100644 --- a/lua/plugins/colorscheme.lua +++ b/lua/plugins/colorscheme.lua @@ -366,6 +366,10 @@ return { variables = "none", }, highlights = { + -- overide indent line fill color + NvimTreeNormal = { fg = "$fg", bg = "$bg0" }, + NvimTreeIndentMarker = { fg = "#3E4450" }, + IblIndent = { fg = "#3E4450" }, ["@markup.link.url"] = { fg = "$cyan", fmt = "italic" }, ["@text.uri"] = { fg = "$cyan", fmt = "none" }, ["@tag"] = { fg = "$red" }, diff --git a/lua/plugins/transparant.lua b/lua/plugins/transparant.lua index 42be48f..248fddd 100644 --- a/lua/plugins/transparant.lua +++ b/lua/plugins/transparant.lua @@ -42,6 +42,8 @@ return { "NeoTreeCursorLine", -- disable Telescope active selection background "TelescopeSelection", + -- disable lualine background color + "LualineNormal", }, }) require("transparent").clear_prefix("BufferLine") @@ -53,15 +55,15 @@ return { require("transparent").clear_prefix("NvimTree") -- clear prefix for NeoTree require("transparent").clear_prefix("NeoTree") + -- clear prefix for Telescope + require("transparent").clear_prefix("Telescope") if clear_lualine then -- clear prefix for Lualine require("transparent").clear_prefix("Lualine") + -- create auto command to set transparent + vim.cmd("TransparentDisable") + vim.cmd("TransparentEnable") end - -- clear prefix for Telescope - require("transparent").clear_prefix("Telescope") - -- create auto command to set transparent - vim.cmd("TransparentDisable") - vim.cmd("TransparentEnable") end, }, } diff --git a/lua/user/tokyonight.lua b/lua/user/tokyonight.lua index 7439751..685f723 100644 --- a/lua/user/tokyonight.lua +++ b/lua/user/tokyonight.lua @@ -3,7 +3,7 @@ if not status_ok then return end local transp = false -local sidebar = "dark" +local sidebar = "normal" --"dark , transparent, normal" local hilight = "#292e42" local data_exists, config = pcall(require, "core.config") if data_exists then @@ -61,5 +61,10 @@ tokyonight.setup({ highlights.Underlined = { underline = false, } + highlights.NvimTreeWinSeparator = { + fg = colors.border, + } + highlights.BufferLineFill = { bg = colors.bg } + highlights.NvimTreeSpecialFile = { fg = colors.purple, underline = false } end, })