From 32e96de43f07f86c4643f4a69377cd4db74a4083 Mon Sep 17 00:00:00 2001
From: Zoe Roux <zoe.roux@zoriya.dev>
Date: Fri, 9 May 2025 19:52:46 +0200
Subject: [PATCH] Bundle ruff in nvim closure

---
 nvim/default.nix                | 1 +
 nvim/lua/plugins/conform.lua    | 8 +-------
 nvim/lua/plugins/motions.lua    | 8 --------
 nvim/lua/plugins/treesitter.lua | 8 --------
 4 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/nvim/default.nix b/nvim/default.nix
index 8b5c173..fe8ea8a 100644
--- a/nvim/default.nix
+++ b/nvim/default.nix
@@ -153,5 +153,6 @@ in
       # might need to find a way to disable it for projects that use prettier but it's just more convenient to have it always on
       # (for json or to allow use without an outer shell)
       biome
+      ruff
     ];
   }
diff --git a/nvim/lua/plugins/conform.lua b/nvim/lua/plugins/conform.lua
index fe2545a..469df9b 100644
--- a/nvim/lua/plugins/conform.lua
+++ b/nvim/lua/plugins/conform.lua
@@ -14,13 +14,7 @@ return {
 		opts = {
 			default_format_opts = { async = true },
 			formatters_by_ft = {
-				python = function(bufnr)
-					if require("conform").get_formatter_info("ruff_format", bufnr).available then
-						return { "ruff_format", "ruff_organize_imports" }
-					else
-						return { "isort", "black" }
-					end
-				end,
+				python = { "ruff_format", "ruff_organize_imports" },
 				javascript = { "biome-check", "prettierd", "prettier", stop_after_first = true },
 				typescript = { "biome-check", "prettierd", "prettier", stop_after_first = true },
 				javascriptreact = { "biome-check", "prettierd", "prettier", stop_after_first = true },
diff --git a/nvim/lua/plugins/motions.lua b/nvim/lua/plugins/motions.lua
index 3a6dc5c..b449fc2 100644
--- a/nvim/lua/plugins/motions.lua
+++ b/nvim/lua/plugins/motions.lua
@@ -24,14 +24,6 @@ return {
 		end,
 	},
 
-	{
-		"increment-activator",
-		keys = {
-			{ "<C-A>", desc = "Increment" },
-			{ "<C-X>", desc = "Decrement" },
-		},
-	},
-
 	{
 		"leap.nvim",
 		keys = {
diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua
index 7e7363f..fc98bac 100644
--- a/nvim/lua/plugins/treesitter.lua
+++ b/nvim/lua/plugins/treesitter.lua
@@ -35,14 +35,6 @@ return {
 		end
 	},
 
-	-- {
-	-- 	"ts-comments.nvim",
-	-- 	event = { "BufReadPost", "BufWritePost", "BufNewFile" },
-	-- 	after = function()
-	-- 		require("ts-comments").setup({})
-	-- 	end,
-	-- },
-
 	{
 		"vim-illuminate",
 		load = vim.cmd.packadd,