fix catppuccin + lightspeed -> leap

2 files changed, 29 insertions, 20 deletions

diff --git a/.config/nvim/lua/getchoo/init.lua b/.config/nvim/lua/getchoo/init.lua
index 83233ea..beae5d6 100644
--- a/.config/nvim/lua/getchoo/init.lua
+++ b/.config/nvim/lua/getchoo/init.lua
@@ -9,11 +9,36 @@ local M = {}
 M.bufferline = {
 	animation = true,
 	auto_hide = true,
+	highlights = require("catppuccin.groups.integrations.bufferline").get(),
 	icons = true,
 	maximum_padding = 2,
 	semantic_letters = true,
 }
 
+local compile_path = vim.fn.stdpath("cache") .. "/catppuccin-nvim"
+vim.fn.mkdir(compile_path, "p")
+vim.opt.runtimepath:append(compile_path)
+
+M.catppuccin = {
+	compile_path = compile_path,
+	flavour = "mocha", -- mocha, macchiato, frappe, latte
+	integrations = {
+		barbar = true,
+		cmp = true,
+		gitsigns = true,
+		leap = true,
+		native_lsp = {
+			enabled = true,
+		},
+		nvimtree = true,
+		treesitter_context = true,
+		treesitter = true,
+		telescope = true,
+		lsp_trouble = true,
+	},
+	no_italic = true,
+}
+
 M.lualine = {
 	options = {
 		theme = "catppuccin",
@@ -23,7 +48,10 @@ M.lualine = {
 
 M.tree = {}
 
+require("catppuccin").setup(M.catppuccin)
+vim.api.nvim_command("colorscheme catppuccin")
 require("bufferline").setup(M.bufferline)
+require("leap").add_default_mappings()
 require("lualine").setup(M.lualine)
 require("nvim-tree").setup(M.tree)
 
diff --git a/.config/nvim/lua/getchoo/plugins.lua b/.config/nvim/lua/getchoo/plugins.lua
index d3f1863..222ed80 100644
--- a/.config/nvim/lua/getchoo/plugins.lua
+++ b/.config/nvim/lua/getchoo/plugins.lua
@@ -28,25 +28,6 @@ require("packer").startup(function(use)
 	use({
 		"catppuccin/nvim",
 		as = "catppuccin",
-		config = function()
-			require("catppuccin").setup({
-				flavour = "mocha", -- mocha, macchiato, frappe, latte
-				integrations = {
-					barbar = true,
-					gitsigns = true,
-					lightspeed = true,
-					mason = true,
-					cmp = true,
-					nvimtree = true,
-					treesitter_context = true,
-					treesitter = true,
-					telescope = true,
-					lsp_trouble = true,
-				},
-				no_italic = true,
-			})
-			vim.api.nvim_command("colorscheme catppuccin")
-		end,
 	})
 
 	---- use("shaunsingh/nord.nvim")
@@ -58,7 +39,7 @@ require("packer").startup(function(use)
 		requires = { "kyazdani42/nvim-web-devicons" },
 	})
 
-	use("ggandor/lightspeed.nvim")
+	use("ggandor/leap.nvim")
 	use("kyazdani42/nvim-tree.lua")
 
 	-- lsp plugins