From baed1cef1f1f77363511a801507e14dee12f137e Mon Sep 17 00:00:00 2001
From: omri <omri@kehilush.com>
Date: Sat, 20 Apr 2024 14:15:19 +0300
Subject: [PATCH] nvim: new formatters and less treesitter mappings

---
 .config/nvim/lua/plugins/autopairs.lua        |  1 -
 .config/nvim/lua/plugins/formatter.lua        |  5 +-
 .config/nvim/lua/plugins/lint.lua             |  1 -
 .../lua/plugins/treesitter-textobjects.lua    | 76 +++++++++----------
 4 files changed, 39 insertions(+), 44 deletions(-)

diff --git a/.config/nvim/lua/plugins/autopairs.lua b/.config/nvim/lua/plugins/autopairs.lua
index 4600347..ef88688 100644
--- a/.config/nvim/lua/plugins/autopairs.lua
+++ b/.config/nvim/lua/plugins/autopairs.lua
@@ -1,7 +1,6 @@
 return {
 	"windwp/nvim-autopairs",
 	config = function()
-		-- autopairs
 		require("nvim-autopairs").setup({})
 		-- insert () after selecting functions
 		local cmp_autopairs = require("nvim-autopairs.completion.cmp")
diff --git a/.config/nvim/lua/plugins/formatter.lua b/.config/nvim/lua/plugins/formatter.lua
index 43ae4a9..9da57e9 100644
--- a/.config/nvim/lua/plugins/formatter.lua
+++ b/.config/nvim/lua/plugins/formatter.lua
@@ -17,7 +17,7 @@ return {
 					require("formatter.filetypes.json").jq,
 				},
 				python = {
-					require("formatter.filetypes.python").black,
+					require("formatter.filetypes.python").ruff,
 				},
 				rust = {
 					require("formatter.filetypes.rust").rustfmt,
@@ -34,9 +34,6 @@ return {
 				javascript = {
 					require("formatter.filetypes.javascript").prettier,
 				},
-				terraform = {
-					require("formatter.filetypes.terraform").terraformfmt,
-				},
 				yaml = {
 					require("formatter.filetypes.yaml").yamlfmt,
 				},
diff --git a/.config/nvim/lua/plugins/lint.lua b/.config/nvim/lua/plugins/lint.lua
index d5f505b..9051a70 100644
--- a/.config/nvim/lua/plugins/lint.lua
+++ b/.config/nvim/lua/plugins/lint.lua
@@ -3,7 +3,6 @@ return {
 	config = function()
 		require("lint").linters_by_ft = {
 			python = { "mypy" },
-			rust = { "ruff" },
 			go = { "golangcilint" },
 		}
 
diff --git a/.config/nvim/lua/plugins/treesitter-textobjects.lua b/.config/nvim/lua/plugins/treesitter-textobjects.lua
index 5d8a5a7..580f49b 100644
--- a/.config/nvim/lua/plugins/treesitter-textobjects.lua
+++ b/.config/nvim/lua/plugins/treesitter-textobjects.lua
@@ -52,44 +52,44 @@ return {
 						["<leader>rh"] = "@parameter.inner",
 					},
 				},
-				move = {
-					enable = true,
-					set_jumps = true, -- whether to set jumps in the jumplist
-					goto_next_start = {
-						["]m"] = "@function.outer",
-						["]]"] = { query = "@class.outer", desc = "Next class start" },
-						--
-						-- You can use regex matching (i.e. lua pattern) and/or pass a list in a "query" key to group multiple queires.
-						["]o"] = "@loop.*",
-						-- ["]o"] = { query = { "@loop.inner", "@loop.outer" } }
-						--
-						-- You can pass a query group to use query from `queries/<lang>/<query_group>.scm file in your runtime path.
-						-- Below example nvim-treesitter's `locals.scm` and `folds.scm`. They also provide highlights.scm and indent.scm.
-						["]s"] = { query = "@scope", query_group = "locals", desc = "Next scope" },
-						["]z"] = { query = "@fold", query_group = "folds", desc = "Next fold" },
-					},
-					goto_next_end = {
-						["]M"] = "@function.outer",
-						["]["] = "@class.outer",
-					},
-					goto_previous_start = {
-						["[m"] = "@function.outer",
-						["[["] = "@class.outer",
-					},
-					goto_previous_end = {
-						["[M"] = "@function.outer",
-						["[]"] = "@class.outer",
-					},
-					-- Below will go to either the start or the end, whichever is closer.
-					-- Use if you want more granular movements
-					-- Make it even more gradual by adding multiple queries and regex.
-					goto_next = {
-						["]d"] = "@conditional.outer",
-					},
-					goto_previous = {
-						["[d"] = "@conditional.outer",
-					},
-				},
+				-- move = {
+				-- 	enable = true,
+				-- 	set_jumps = true, -- whether to set jumps in the jumplist
+				-- 	goto_next_start = {
+				-- 		["]m"] = "@function.outer",
+				-- 		["]]"] = { query = "@class.outer", desc = "Next class start" },
+				-- 		--
+				-- 		-- You can use regex matching (i.e. lua pattern) and/or pass a list in a "query" key to group multiple queires.
+				-- 		["]o"] = "@loop.*",
+				-- 		-- ["]o"] = { query = { "@loop.inner", "@loop.outer" } }
+				-- 		--
+				-- 		-- You can pass a query group to use query from `queries/<lang>/<query_group>.scm file in your runtime path.
+				-- 		-- Below example nvim-treesitter's `locals.scm` and `folds.scm`. They also provide highlights.scm and indent.scm.
+				-- 		["]s"] = { query = "@scope", query_group = "locals", desc = "Next scope" },
+				-- 		["]z"] = { query = "@fold", query_group = "folds", desc = "Next fold" },
+				-- 	},
+				-- 	goto_next_end = {
+				-- 		["]M"] = "@function.outer",
+				-- 		["]["] = "@class.outer",
+				-- 	},
+				-- 	goto_previous_start = {
+				-- 		["[m"] = "@function.outer",
+				-- 		["[["] = "@class.outer",
+				-- 	},
+				-- 	goto_previous_end = {
+				-- 		["[M"] = "@function.outer",
+				-- 		["[]"] = "@class.outer",
+				-- 	},
+				-- 	-- Below will go to either the start or the end, whichever is closer.
+				-- 	-- Use if you want more granular movements
+				-- 	-- Make it even more gradual by adding multiple queries and regex.
+				-- 	goto_next = {
+				-- 		["]d"] = "@conditional.outer",
+				-- 	},
+				-- 	goto_previous = {
+				-- 		["[d"] = "@conditional.outer",
+				-- 	},
+				-- },
 			},
 		})
 	end,