diff --git a/lua/config/options.lua b/lua/config/options.lua index 106e615..254844b 100644 --- a/lua/config/options.lua +++ b/lua/config/options.lua @@ -147,7 +147,3 @@ vim.diagnostic.config({ update_in_insert = false, -- Don't update diagnostics in insert mode severity_sort = true, -- Sort diagnostics by severity }) - --- Window border for floating windows - -require('bamboo').load() diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua index d5711ff..5bb3171 100644 --- a/lua/plugins/lualine.lua +++ b/lua/plugins/lualine.lua @@ -6,7 +6,6 @@ return { }, config = function() vim.opt.laststatus = 3 - local colors = require('bamboo.palette') require('lualine').setup({ options = { theme = 'auto', @@ -30,18 +29,15 @@ return { lualine_c = { { 'getcwd', - color = { fg = colors.vulgaris.orange, gui = 'bold' }, }, { 'filename', path = 1, file_status = true, - color = { fg = colors.vulgaris.light_blue, gui = 'bold' }, }, { function() return require('nvim-navic').get_location() end, cond = function() return package.loaded['nvim-navic'] and require('nvim-navic').is_available() end, - color = { fg = colors.vulgaris.blue }, }, }, lualine_y = { @@ -66,7 +62,6 @@ return { path = 0, file_status = true, separator = { left = '', right = '' }, - color = { fg = '#000000', bg = '#ff9966', gui = 'bold' }, }, }, lualine_b = { @@ -95,7 +90,6 @@ return { path = 0, file_status = true, separator = { left = '', right = '' }, - color = { fg = '#000000', bg = '#8fb573' }, }, }, lualine_b = { @@ -117,7 +111,7 @@ return { mode = 2, tabs_color = { -- Same values as the general color option can be used here. - active = { bg = 'orange', fg = 'black' }, + active = { bg = 'yellow', fg = 'black' }, inactive = { bg = 'grey' }, }, }, diff --git a/lua/plugins/snacks.lua b/lua/plugins/snacks.lua index f1665a8..fdaf7d9 100644 --- a/lua/plugins/snacks.lua +++ b/lua/plugins/snacks.lua @@ -18,7 +18,6 @@ return { }, indent = { indent = { - hl = 'CmpItemKindNull', only_scope = false, only_current = false, }, diff --git a/lua/themes/bamboo.lua b/lua/themes/bamboo.lua index 9494fa7..88ba1f7 100644 --- a/lua/themes/bamboo.lua +++ b/lua/themes/bamboo.lua @@ -1,7 +1,7 @@ return { 'ribru17/bamboo.nvim', lazy = true, - priority = 1000, + -- priority = 1000, config = function() local colors = require('bamboo.palette') require('bamboo').setup({ @@ -78,5 +78,5 @@ return { }) require('bamboo').load() end, - enabled = true, + enabled = false, } diff --git a/lua/themes/kanagawa.lua b/lua/themes/kanagawa.lua index 2cc01f9..10ba21b 100644 --- a/lua/themes/kanagawa.lua +++ b/lua/themes/kanagawa.lua @@ -1,6 +1,6 @@ return { 'rebelot/kanagawa.nvim', - lazy = true, + lazy = false, config = function() require('kanagawa').setup({ compile = false, -- enable compiling the colorscheme @@ -23,7 +23,7 @@ return { ['@lsp.mod.readonly'] = { bold = true }, ['@lsp.mod.static'] = { italic = true }, ['LspReferenceRead'] = { bg = colors.palette.lotusGreen, fg = colors.palette.dragonBlack0 }, - ['LspReferenceWrite'] = { bg = colors.palette.lotusRed, fg = colors.palette.fujiWhite }, + ['LspReferenceWrite'] = { bg = colors.palette.samuraiRed, fg = colors.palette.dragonBlack0 }, } end, theme = 'wave', -- Load "wave" theme when 'background' option is not set @@ -33,6 +33,7 @@ return { light = 'lotus', }, }) + vim.cmd('colorscheme kanagawa') end, enabled = true, }