plugin stuff

lua/plugins/init.lua

@@ -1,63 +1,51 @@
 return {
-	"folke/which-key.nvim",
-	'pbrisbin/vim-mkdir',
-	'fladson/vim-kitty',
-	'tpope/vim-repeat',
-	'tpope/vim-surround',
-	'tpope/vim-characterize',
-	'tpope/vim-commentary',
-	'tpope/vim-sleuth',
+	"pbrisbin/vim-mkdir",
+	"fladson/vim-kitty",
+	"tpope/vim-repeat",
+	"tpope/vim-surround",
+	"tpope/vim-characterize",
+	"tpope/vim-commentary",
 
 	{ "chrisgrieser/nvim-genghis", dependencies = "stevearc/dressing.nvim" },
 
 	-- ic / ac
 	{
-		'glts/vim-textobj-comment',
-		dependencies = { 'kana/vim-textobj-user' }
+		"glts/vim-textobj-comment",
+		dependencies = { "kana/vim-textobj-user" },
 	},
 	-- ii / ai
-	'michaeljsmith/vim-indent-object',
-	'neovim/nvim-lspconfig',
+	"michaeljsmith/vim-indent-object",
+	"neovim/nvim-lspconfig",
 
 	{
-		'nvim-telescope/telescope.nvim',
-		dependencies = { 'nvim-lua/plenary.nvim' }
+		"nvim-telescope/telescope.nvim",
+		dependencies = { "nvim-lua/plenary.nvim" },
 	},
 
 	{
-		'ray-x/lsp_signature.nvim',
+		"ray-x/lsp_signature.nvim",
 		config = function()
-			require('lsp_signature').setup({})
-		end
-	},
-	'kyazdani42/nvim-web-devicons',
-	'folke/trouble.nvim',
-	'folke/lsp-colors.nvim',
-	'nvim-lua/popup.nvim',
-	'junegunn/vim-easy-align',
-	'machakann/vim-highlightedyank',
-	'lambdalisue/suda.vim',
-	'jamessan/vim-gnupg',
-
-	{
-		'lervag/vimtex',
-		init = function()
-			vim.g.tex_conceal = "agm"
-			vim.g.vimtex_quickfix_ignorefilters = { 'overfull', 'underfull' }
-			vim.g.vimtex_syntax_enabled = 0
+			require("lsp_signature").setup({})
 		end,
-		ft = "tex",
 	},
-	'ledger/vim-ledger',
-	'anekos/hledger-vim',
+	"kyazdani42/nvim-web-devicons",
+	"folke/trouble.nvim",
+	"folke/lsp-colors.nvim",
+	"nvim-lua/popup.nvim",
+	"junegunn/vim-easy-align",
+	"machakann/vim-highlightedyank",
+	"lambdalisue/suda.vim",
+	"jamessan/vim-gnupg",
+	"ledger/vim-ledger",
+	"anekos/hledger-vim",
 
-	'vim-pandoc/vim-pandoc',
-	'vim-pandoc/vim-pandoc-syntax',
-	'isobit/vim-caddyfile',
-	'Glench/Vim-Jinja2-Syntax',
-	'GEverding/vim-hocon',
-	'nfnty/vim-nftables',
-	'nfnty/vim-nftables',
-	'Everduin94/nvim-quick-switcher',
+	"vim-pandoc/vim-pandoc",
+	"vim-pandoc/vim-pandoc-syntax",
+	"isobit/vim-caddyfile",
+	"Glench/Vim-Jinja2-Syntax",
+	"GEverding/vim-hocon",
+	"nfnty/vim-nftables",
+	"nfnty/vim-nftables",
+	"Everduin94/nvim-quick-switcher",
 }
 --  'powerman/vim-plugin-AnsiEsc',

lua/plugins/treesitter.lua

@@ -5,7 +5,7 @@ end
 return {
 	{
 		"nvim-treesitter/nvim-treesitter",
-		version = false, -- last release is way too old and doesn't work on Windows
+		version = false,
 		build = ":TSUpdate",
 		event = { "BufReadPost", "BufNewFile" },
 		dependencies = {
@@ -32,10 +32,11 @@ return {
 		},
 		keys = {
 			{ "<c-space>", desc = "Increment selection" },
-			{ "<bs>",      desc = "Decrement selection", mode = "x" },
+			{ "<bs>", desc = "Decrement selection", mode = "x" },
 		},
-		---@type TSConfig
 		opts = {
+			auto_install = true,
+			ignore_install = {},
 			highlight = { enable = true, disable = ts_disable },
 			indent = { enable = true },
 			ensure_installed = {
@@ -68,6 +69,36 @@ return {
 					node_decremental = "<bs>",
 				},
 			},
+			textobjects = {
+				select = {
+					enable = true,
+					lookahead = true,
+					keymaps = {
+						-- stylua: ignore start
+						["af"] = { query = "@function.outer",  desc = "outer function" },
+						["if"] = { query = "@function.inner",  desc = "inner function" },
+						["ac"] = { query = "@class.outer",     desc = "outer class" },
+						["ic"] = { query = "@class.inner",     desc = "inner class" },
+						["ap"] = { query = "@parameter.outer", desc = "outer parameter" },
+						["ip"] = { query = "@parameter.inner", desc = "inner parameter" },
+						-- stylua: ignore end
+					},
+					selection_modes = {
+						["@parameter.outer"] = "v", -- charwise
+						["@function.outer"] = "V", -- linewise
+						["@class.outer"] = "V",
+					},
+				},
+				swap = {
+					enable = true,
+					swap_next = {
+						["<leader>a"] = "@parameter.inner",
+					},
+					swap_previous = {
+						["<leader>A"] = "@parameter.inner",
+					},
+				},
+			},
 		},
 		---@param opts TSConfig
 		config = function(_, opts)
@@ -86,28 +117,29 @@ return {
 		end,
 	},
 	{
-		'nvim-treesitter/playground',
+		"nvim-treesitter/playground",
 		dependencies = { "nvim-treesitter/nvim-treesitter" },
 		cmd = {
-			'TSPlaygroundToggle',
-			'TSHighlightCapturesUnderCursor',
-			'TSNodeUnderCursor',
-		}
+			"TSPlaygroundToggle",
+			"TSHighlightCapturesUnderCursor",
+			"TSNodeUnderCursor",
+		},
 	},
 	{
 		"nvim-treesitter/nvim-treesitter-context",
 		event = "VeryLazy",
 		dependencies = { "nvim-treesitter/nvim-treesitter" },
-		cmd = { 'TSContextEnable', 'TSContextDisable', 'TSContextToggle' },
+		cmd = { "TSContextEnable", "TSContextDisable", "TSContextToggle" },
 		keys = {
-			{ "[c", function() require("treesitter-context").go_to_context() end, desc = "Go to context start" },
+			-- stylua: ignore start
+			{ "[c", function() require("treesitter-context").go_to_context() end, desc = "Go to context start", },
+			-- stylua: ignore end
 		},
 		opts = { enable = true },
 		config = function(_, opts)
-			require 'treesitter-context'.setup(opts)
-			vim.api.nvim_set_hl(0, 'TreesitterContext', { bg = "#555555" })
-			vim.api.nvim_set_hl(0, 'TreesitterContextLineNumber', { link = "Special" })
+			require("treesitter-context").setup(opts)
+			vim.api.nvim_set_hl(0, "TreesitterContext", { bg = "#555555" })
+			vim.api.nvim_set_hl(0, "TreesitterContextLineNumber", { link = "Special" })
 		end,
-	}
-
+	},
 }

lua/plugins/vimtex.lua

@@ -0,0 +1,9 @@
+return {
+	"lervag/vimtex",
+	init = function()
+		vim.g.tex_conceal = "agm"
+		vim.g.vimtex_quickfix_ignorefilters = { "overfull", "underfull" }
+		vim.g.vimtex_syntax_enabled = 0
+	end,
+	ft = "tex",
+}

lua/plugins/which-key.lua

@@ -0,0 +1,9 @@
+return {
+	"folke/which-key.nvim",
+	event = "VeryLazy",
+	init = function()
+		vim.o.timeout = true
+		vim.o.timeoutlen = 300
+	end,
+	opts = {},
+}