diff --git a/home/benk/.config/nvim/init.lua b/home/benk/.config/nvim/init.lua index c2b1450..a7203ff 100644 --- a/home/benk/.config/nvim/init.lua +++ b/home/benk/.config/nvim/init.lua @@ -3,10 +3,6 @@ CACHE_PATH = vim.fn.stdpath('cache') vim.cmd('source ~/.vimrc') -vim.api.nvim_set_hl(0, "NormalFloat", { bg = "NONE" }) -vim.api.nvim_set_hl(0, "FloatBorder", { bg = "NONE" }) -vim.api.nvim_set_hl(0, "CmpItemMenu", { bg = "NONE" }) - local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not vim.loop.fs_stat(lazypath) then vim.fn.system({ diff --git a/home/benk/.config/nvim/lua/plugins.lua b/home/benk/.config/nvim/lua/plugins.lua index d7a6b5b..a22d91b 100644 --- a/home/benk/.config/nvim/lua/plugins.lua +++ b/home/benk/.config/nvim/lua/plugins.lua @@ -5,22 +5,27 @@ return { priority = 1000, config = function() require('kanagawa').setup({ - transparent = true, undercurl = true, commentStyle = { italic = true }, keywordsStyle = { italic = true }, statementStyle = { bold = true }, - overrides = function(colors) - return { - Normal = { bg = 'none' }, - NormalFloat = { bg = 'none' }, - FloatBorder = { fg = colors.palette.sumiInk4, bg = 'none' }, - CursorLine = { bg = colors.palette.sumiInk1 }, - CursorLineNr = { fg = colors.palette.sumiInk6, bold = true }, - } - end }) vim.cmd('colorscheme kanagawa') + -- Transparent bg so catppuccin mocha terminal bg shows through + vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) + vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) + + vim.keymap.set('n', 'tt', function() + if vim.o.background == 'dark' then + vim.o.background = 'light' + vim.cmd('colorscheme kanagawa-lotus') + else + vim.o.background = 'dark' + vim.cmd('colorscheme kanagawa') + vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) + vim.api.nvim_set_hl(0, 'NormalFloat', { bg = 'none' }) + end + end, { desc = 'Toggle light/dark theme' }) end }, -- QUALITY OF LIFE INTEGRATIONS @@ -55,15 +60,6 @@ return { }) end }, - { - 'miversen33/sunglasses.nvim', - config = function() - require('sunglasses').setup({ - filter_type = "SHADE", - filter_percent = .20 - }) - end - }, { 'lewis6991/gitsigns.nvim', config = function() diff --git a/home/benk/.vimrc b/home/benk/.vimrc index 54745e8..772a1a4 100644 --- a/home/benk/.vimrc +++ b/home/benk/.vimrc @@ -59,7 +59,7 @@ set splitbelow set splitright set completeopt=menu,menuone,preview,noinsert,noselect -set guicursor=a:block,i:ver20,v-r:hor20 +set guicursor=a:block-Cursor,i:ver20-Cursor,v-r:hor20-Cursor " The epico quickfix list packadd cfilter