diff --git a/init.lua b/init.lua index 4695ea0..3e6121c 100644 --- a/init.lua +++ b/init.lua @@ -29,3 +29,5 @@ for _, mod in ipairs(modules) do error(('Error loading %s...\n\n%s'):format(mod, err)) end end + +vim.cmd('colorscheme ' .. require('config').colorscheme) diff --git a/lazy-lock.json b/lazy-lock.json index d59d7a9..d0d5e8a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -20,6 +20,7 @@ "none-ls-shellcheck.nvim": { "branch": "main", "commit": "0f84461241e76e376a95fb7391deac82dc3efdbf" }, "none-ls.nvim": { "branch": "main", "commit": "a117163db44c256d53c3be8717f3e1a2a28e6299" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, + "nvim": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" }, "nvim-autopairs": { "branch": "master", "commit": "68f0e5c3dab23261a945272032ee6700af86227a" }, "nvim-cmp": { "branch": "main", "commit": "c27370703e798666486e3064b64d59eaf4bdc6d5" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, diff --git a/lua/config.lua b/lua/config.lua index 1b1ca2d..35af294 100644 --- a/lua/config.lua +++ b/lua/config.lua @@ -1,5 +1,6 @@ local config = { border = 'none', + colorscheme = 'catppuccin', add_plugins = {}, plugins = {}, lsp = { diff --git a/lua/plugins/catppuccin.lua b/lua/plugins/catppuccin.lua new file mode 100644 index 0000000..4acbc13 --- /dev/null +++ b/lua/plugins/catppuccin.lua @@ -0,0 +1,33 @@ +local config = { + flavour = 'mocha', + integrations = { + fidget = true, + which_key = true, + lsp_trouble = true, + telescope = { + enabled = true, + }, + }, + color_overrides = { + mocha = { + base = '#11111b', + mantle = '#181825', + crust = '#11111b', + }, + }, + custom_highlights = function(_) + return { + CursorLine = { bg = '#1e1e2e' }, + } + end, +} + +return { + { -- color scheme + 'catppuccin/nvim', + lazy = false, + config = function() + require('catppuccin').setup(config) + end, + }, +} diff --git a/lua/plugins/fidget.lua b/lua/plugins/fidget.lua index 28db25e..c68efdb 100644 --- a/lua/plugins/fidget.lua +++ b/lua/plugins/fidget.lua @@ -3,9 +3,9 @@ return { opts = { notification = { override_vim_notify = true, - }, - progress = { - poll_rate = 10, + window = { + winblend = 0, + }, }, }, lazy = false, diff --git a/lua/plugins/lualine.lua b/lua/plugins/lualine.lua index c2627d2..1fd2b07 100644 --- a/lua/plugins/lualine.lua +++ b/lua/plugins/lualine.lua @@ -1,3 +1,4 @@ +local config = require('config') local utils = require('utils') local lsp_utils = require('utils.lsp') local icons = require('utils.icons') @@ -31,7 +32,7 @@ local custom_sections = { local plugin_config = { options = { - theme = 'tokyonight', + theme = config.colorscheme, }, sections = { lualine_a = { 'mode' }, diff --git a/lua/plugins/tokyonight.lua b/lua/plugins/tokyonight.lua deleted file mode 100644 index 32f0e2b..0000000 --- a/lua/plugins/tokyonight.lua +++ /dev/null @@ -1,16 +0,0 @@ -local config = { - style = 'night', - light_style = 'moon', - sidebars = { 'qf', 'packer', 'help' }, -} - -return { - { -- color scheme - 'folke/tokyonight.nvim', - lazy = false, - config = function() - require('tokyonight').setup(config) - vim.cmd('color tokyonight') - end, - }, -} diff --git a/lua/plugins_init.lua b/lua/plugins_init.lua index acb9492..134b696 100644 --- a/lua/plugins_init.lua +++ b/lua/plugins_init.lua @@ -9,7 +9,7 @@ require('lazy').setup('plugins', { }, install = { missing = true, - colorscheme = { 'tokyonight' }, + colorscheme = { config.colorscheme }, }, performance = { rtp = {