switch to catppuccin, make changing colorscheme easier

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)

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" },

lua/config.lua

@@ -1,5 +1,6 @@
 local config = {
   border = 'none',
+  colorscheme = 'catppuccin',
   add_plugins = {},
   plugins = {},
   lsp = {

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,
+  },
+}

lua/plugins/fidget.lua

@@ -3,9 +3,9 @@ return {
   opts = {
     notification = {
       override_vim_notify = true,
-    },
+      window = {
-    progress = {
+        winblend = 0,
-      poll_rate = 10,
+      },
     },
   },
   lazy = false,

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' },

lua/plugins/tokyonight.lua

@@ -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,
-  },
-}

lua/plugins_init.lua

@@ -9,7 +9,7 @@ require('lazy').setup('plugins', {
   },
   install = {
     missing = true,
-    colorscheme = { 'tokyonight' },
+    colorscheme = { config.colorscheme },
   },
   performance = {
     rtp = {