Use more mini plugins

modules/cli/nvim/lua/plugins/git.lua

@@ -70,59 +70,4 @@ return {
 			end,
 		},
 	},
-
-	{
-		"ruifm/gitlinker.nvim",
-		dependencies = { "nvim-lua/plenary.nvim" },
-		config = true,
-		keys = {
-			{ "<leader>gy", mode = { "n", "v" }, desc = "Yank remote git url" },
-			{
-				"<leader>go",
-				function()
-					require("gitlinker").get_buf_range_url("n", {
-						action_callback = require "gitlinker.actions".open_in_browser
-					})
-				end,
-				mode = "n",
-				desc = "Open in browser"
-			},
-			{
-				"<leader>go",
-				function()
-					require("gitlinker").get_buf_range_url("v", {
-						action_callback = require "gitlinker.actions".open_in_browser
-					})
-				end,
-				mode = "v",
-				desc = "Open in browser"
-			},
-		},
-	},
-
-	{
-		"echasnovski/mini-git",
-		main = 'mini.git',
-		config = true,
-		cmd = "Git",
-		keys = {
-			{
-				"<leader>gi",
-				function()
-					require("mini.git").show_at_cursor({})
-				end,
-				desc = "Show info at cursor",
-				mode = { "n", "x" },
-			},
-		},
-		init = function()
-			vim.api.nvim_create_autocmd("FileType", {
-				group = vim.api.nvim_create_augroup("MiniGit", { clear = true }),
-				pattern = "git",
-				callback = function()
-					vim.bo.foldexpr = "v:lua.MiniGit.diff_foldexpr()"
-				end,
-			})
-		end
-	},
 }

modules/cli/nvim/lua/plugins/motions.lua

@@ -2,10 +2,10 @@ return {
 	{
 		"ggandor/leap.nvim",
 		keys = {
-			{ "s",  "<Plug>(leap-forward-till)", mode = { "n", "x", }, desc = "Leap forward to" },
-			{ "S",  "<Plug>(leap-backward)",     mode = { "n", "x", }, desc = "Leap backward to" },
-			{ "z",  "<Plug>(leap-forward-till)", mode = "o",           desc = "Leap forward to" },
-			{ "Z",  "<Plug>(leap-backward)",     mode = "o",           desc = "Leap backward to" },
+			{ "s", "<Plug>(leap-forward-till)", mode = { "n", "x", }, desc = "Leap forward to" },
+			{ "S", "<Plug>(leap-backward)",     mode = { "n", "x", }, desc = "Leap backward to" },
+			{ "z", "<Plug>(leap-forward-till)", mode = "o",           desc = "Leap forward to" },
+			{ "Z", "<Plug>(leap-backward)",     mode = "o",           desc = "Leap backward to" },
 		},
 	},
 
@@ -44,10 +44,36 @@ return {
 	"tpope/vim-sleuth",
 
 	{
-		"kylechui/nvim-surround",
-		version = "*",
-		event = "VeryLazy",
-		config = true,
+		"echasnovski/mini.surround",
+		opts = {
+			mappings = {
+				add = "ys",
+				replace = "cs",
+				delete = "ds",
+
+				find = '',
+				find_left = '',
+				highlight = '',
+				update_n_lines = '',
+				suffix_last = 'l',
+				suffix_next = 'n',
+			},
+			custom_surroundings = {
+				B = { output = { left = "{", right = "}" } },
+			},
+		},
+		config = function(_, opts)
+			require("mini.surround").setup(opts)
+
+			vim.keymap.del('x', 'ys')
+			vim.keymap.set('x', 'S', [[:<C-u>lua MiniSurround.add('visual')<CR>]], { silent = true })
+			vim.keymap.set('n', 'yss', 'ys_', { remap = true })
+		end,
+		keys = {
+			{ "ys", desc = "Add surrounding" },
+			{ "cs", desc = "Change surroundings" },
+			{ "ds", desc = "Delete surroundings" },
+		},
 	},
 
 	{
@@ -59,10 +85,17 @@ return {
 	},
 
 	{
-		"vim-scripts/ReplaceWithRegister",
+		"echasnovski/mini.operators",
+		opts = {
+			replace = {
+				prefix = "cr",
+				reindent_linewise = true,
+			},
+		},
 		keys = {
-			{ "cr",         "<Plug>ReplaceWithRegisterOperator",   desc = "Replace with register" },
-			{ "<leader>cr", '"+<Plug>ReplaceWithRegisterOperator', desc = "Replace with system clipboard" },
+			{ "gx" },
+			{ "cr",         desc = "Replace with register" },
+			{ "<leader>cr", '"+cr',                        desc = "Replace with system clipboard" },
 		},
 	},
 
@@ -86,7 +119,6 @@ return {
 			{ "gA", desc = "Align with preview" }
 		},
 		config = true,
-		version = '*',
 	},
 
 	{

modules/cli/nvim/lua/plugins/treesiter.lua

@@ -4,9 +4,6 @@ return {
 		version = false,
 		build = ":TSUpdate",
 		event = { "BufReadPost", "BufWritePost", "BufNewFile" },
-		dependencies = {
-			"nvim-treesitter/nvim-treesitter-textobjects"
-		},
 		opts = {
 			highlight = {
 				enable = true,
@@ -15,21 +12,6 @@ return {
 			indent = { enable = true },
 			ensure_installed = "all",
 			sync_install = false,
-			textobjects = {
-				select = {
-					enable = true,
-					lookahead = false,
-
-					keymaps = {
-						["af"] = "@function.outer",
-						["if"] = "@function.inner",
-						["ac"] = "@class.outer",
-						["ic"] = "@class.inner",
-						["ia"] = "@parameter.inner",
-						["aa"] = "@parameter.outer",
-					},
-				},
-			},
 			matchup = { enable = true },
 		},
 		main = "nvim-treesitter.configs",
@@ -71,5 +53,16 @@ return {
 		config = function()
 			vim.keymap.del("o", "z%")
 		end
-	}
+	},
+
+	{
+		"echasnovski/mini.ai",
+		opts = {
+			custom_textobjects = {
+				B = { { "%b{}" }, "^.().*().$" }
+			},
+			n_lines = 500,
+		},
+		event = "VeryLazy",
+	},
 }

modules/cli/nvim/lua/plugins/ui.lua

@@ -150,7 +150,7 @@ return {
 			},
 			user_default_options = {
 				mode = "virtualtext",
-				RGB = true,
+				RGB = false,
 				RRGGBB = true,
 				names = false,
 				RRGGBBAA = true,
@@ -230,9 +230,6 @@ return {
 		dependencies = "nvim-lua/plenary.nvim",
 		config = true,
 		event = "VeryLazy",
-		keys = {
-			{ "<leader>t", "<cmd>TodoQuickFix<cr>", desc = "Open todo list" },
-		}
 	},
 
 	{