Merge branch 'main' into feat/grug-far

ayamir · Feb 5, 2025 · 3ddd9b8 · 3ddd9b8
2 parents 9563010 + 4345c04
commit 3ddd9b8
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 53 deletions.
diff --git a/lua/keymap/ui.lua b/lua/keymap/ui.lua
@@ -88,14 +88,14 @@ bind.nvim_load_mapping(mappings.plugins)
 local M = {}
 
 function M.gitsigns(bufnr)
-	local actions = require("gitsigns.actions")
+	local gitsigns = require("gitsigns")
 	local map = {
 		["n|]g"] = map_callback(function()
 				if vim.wo.diff then
 					return "]g"
 				end
 				vim.schedule(function()
-					actions.next_hunk()
+					gitsigns.nav_hunk("next")
 				end)
 				return "<Ignore>"
 			end)
@@ -108,7 +108,7 @@ function M.gitsigns(bufnr)
 					return "[g"
 				end
 				vim.schedule(function()
-					actions.prev_hunk()
+					gitsigns.nav_hunk("prev")
 				end)
 				return "<Ignore>"
 			end)
@@ -117,50 +117,50 @@ function M.gitsigns(bufnr)
 			:with_expr()
 			:with_desc("git: Goto prev hunk"),
 		["n|<leader>gs"] = map_callback(function()
-				actions.stage_hunk()
+				gitsigns.stage_hunk()
 			end)
 			:with_buffer(bufnr)
 			:with_noremap()
 			:with_desc("git: Toggle staging/unstaging of hunk"),
 		["v|<leader>gs"] = map_callback(function()
-				actions.stage_hunk({ vim.fn.line("."), vim.fn.line("v") })
+				gitsigns.stage_hunk({ vim.fn.line("."), vim.fn.line("v") })
 			end)
 			:with_buffer(bufnr)
 			:with_noremap()
 			:with_desc("git: Toggle staging/unstaging of selected hunk"),
 		["n|<leader>gr"] = map_callback(function()
-				actions.reset_hunk()
+				gitsigns.reset_hunk()
 			end)
 			:with_buffer(bufnr)
 			:with_noremap()
 			:with_desc("git: Reset hunk"),
 		["v|<leader>gr"] = map_callback(function()
-				actions.reset_hunk({ vim.fn.line("."), vim.fn.line("v") })
+				gitsigns.reset_hunk({ vim.fn.line("."), vim.fn.line("v") })
 			end)
 			:with_buffer(bufnr)
 			:with_noremap()
 			:with_desc("git: Reset hunk"),
 		["n|<leader>gR"] = map_callback(function()
-				actions.reset_buffer()
+				gitsigns.reset_buffer()
 			end)
 			:with_buffer(bufnr)
 			:with_noremap()
 			:with_desc("git: Reset buffer"),
 		["n|<leader>gp"] = map_callback(function()
-				actions.preview_hunk()
+				gitsigns.preview_hunk()
 			end)
 			:with_buffer(bufnr)
 			:with_noremap()
 			:with_desc("git: Preview hunk"),
 		["n|<leader>gb"] = map_callback(function()
-				actions.blame_line({ full = true })
+				gitsigns.blame_line({ full = true })
 			end)
 			:with_buffer(bufnr)
 			:with_noremap()
 			:with_desc("git: Blame line"),
 		-- Text objects
 		["ox|ih"] = map_callback(function()
-				actions.select_hunk()
+				gitsigns.select_hunk()
 			end)
 			:with_buffer(bufnr)
 			:with_noremap(),

diff --git a/lua/modules/configs/ui/catppuccin.lua b/lua/modules/configs/ui/catppuccin.lua
@@ -30,7 +30,23 @@ return function()
 			properties = {},
 		},
 		integrations = {
-			treesitter = true,
+			cmp = true,
+			dap = true,
+			dap_ui = true,
+			diffview = true,
+			dropbar = { enabled = true, color_mode = true },
+			fidget = true,
+			flash = true,
+			fzf = true,
+			gitsigns = true,
+			hop = true,
+			illuminate = true,
+			indent_blankline = { enabled = true, colored_indent_levels = true },
+			lsp_saga = true,
+			lsp_trouble = true,
+			markdown = true,
+			mason = true,
+			mini = { enabled = true, indentscope_color = "" },
 			native_lsp = {
 				enabled = true,
 				virtual_text = {
@@ -46,54 +62,14 @@ return function()
 					information = { "underline" },
 				},
 			},
-			aerial = false,
-			alpha = false,
-			barbar = false,
-			beacon = false,
-			cmp = true,
-			coc_nvim = false,
-			dap = true,
-			dap_ui = true,
-			dashboard = false,
-			dropbar = { enabled = true, color_mode = true },
-			fern = false,
-			fidget = true,
-			flash = true,
-			gitgutter = false,
-			gitsigns = true,
-			grug_far = true,
-			harpoon = false,
-			headlines = false,
-			hop = true,
-			illuminate = true,
-			indent_blankline = { enabled = true, colored_indent_levels = false },
-			leap = false,
-			lightspeed = false,
-			lsp_saga = true,
-			lsp_trouble = true,
-			markdown = true,
-			mason = true,
-			mini = false,
-			navic = { enabled = false },
-			neogit = false,
-			neotest = false,
-			neotree = { enabled = false, show_root = true, transparent_panel = false },
-			noice = false,
 			notify = true,
 			nvimtree = true,
-			overseer = false,
-			pounce = false,
 			rainbow_delimiters = true,
 			render_markdown = true,
-			sandwich = false,
 			semantic_tokens = true,
-			symbols_outline = false,
-			telekasten = false,
 			telescope = { enabled = true, style = "nvchad" },
+			treesitter = true,
 			treesitter_context = true,
-			ts_rainbow = false,
-			vim_sneak = false,
-			vimwiki = false,
 			which_key = true,
 		},
 		color_overrides = {},